From ad04b308c06bcb2453e52da9f4821f7f12a618b5 Mon Sep 17 00:00:00 2001 From: Shendare Date: Sun, 8 Nov 2015 22:18:51 -0800 Subject: [PATCH 1/2] Quick query logging addition Reports records affected by inserts, updates, and deletes as well as the records returned by selects. --- common/dbcore.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/dbcore.cpp b/common/dbcore.cpp index d256f7b42..33c691afc 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -128,7 +128,12 @@ MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, boo MySQLRequestResult requestResult(res, (uint32)mysql_affected_rows(&mysql), rowCount, (uint32)mysql_field_count(&mysql), (uint32)mysql_insert_id(&mysql)); if (Log.log_settings[Logs::MySQLQuery].is_category_enabled == 1) - Log.Out(Logs::General, Logs::MySQLQuery, "%s (%u rows returned)", query, rowCount, requestResult.RowCount()); + { + if ((strlen(query) > 6) && (_memicmp(query, "select", 6) == 0)) + Log.Out(Logs::General, Logs::MySQLQuery, "%s (%u row%s returned)", query, requestResult.RowCount(), requestResult.RowCount() == 1 ? "" : "s"); + else + Log.Out(Logs::General, Logs::MySQLQuery, "%s (%u row%s affected)", query, requestResult.RowsAffected(), requestResult.RowsAffected() == 1 ? "" : "s"); + } return requestResult; } From 992797f6108c0aa47a11602bf512a00e7d61d74c Mon Sep 17 00:00:00 2001 From: Shendare Date: Sun, 8 Nov 2015 22:41:39 -0800 Subject: [PATCH 2/2] Fixed query logging addition Resolved platform specific function use. --- common/dbcore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/dbcore.cpp b/common/dbcore.cpp index 33c691afc..76e87cde1 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -129,7 +129,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, boo if (Log.log_settings[Logs::MySQLQuery].is_category_enabled == 1) { - if ((strlen(query) > 6) && (_memicmp(query, "select", 6) == 0)) + if ((strncasecmp(query, "select", 6) == 0)) Log.Out(Logs::General, Logs::MySQLQuery, "%s (%u row%s returned)", query, requestResult.RowCount(), requestResult.RowCount() == 1 ? "" : "s"); else Log.Out(Logs::General, Logs::MySQLQuery, "%s (%u row%s affected)", query, requestResult.RowsAffected(), requestResult.RowsAffected() == 1 ? "" : "s");