From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 1 Jul 2014 19:38:53 +0000 (+0200)
Subject: Database: Generalise SQL before writing to debug log
X-Git-Tag: 1.31.0-rc.0~15133^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=cbeda77bd3a114774b69d6cf93e30f8f405a6704;p=lhc%2Fweb%2Fwiklou.git

Database: Generalise SQL before writing to debug log

The log often contains stuff like the following, where the trimmed
snippet can span many many lines:

* DatabaseBase::query: Writes done: INSERT IGNORE INTO `msg_resource`
   (mr_lang,mr_resource,mr_blob,mr_timestamp) VALUES ('۶?2x?ptt?`0<snip>?`0??O?')
* DatabaseBase::query: Writes done: REPLACE INTO `objectcache`
   (keyname,value,exptime) VALUES ('۶?2x?ptt?`0<snip>?`0??O ?`???`0??O ?`???`0?')

Bug: 67382
Change-Id: I76ca042f166fed56d86df15f788702384d48064c
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 699ab718b1..7d8fbe930d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1022,7 +1022,7 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 		$this->mLastQuery = $sql;
 		if ( !$this->mDoneWrites && $this->isWriteQuery( $sql ) ) {
 			# Set a flag indicating that writes have been done
-			wfDebug( __METHOD__ . ": Writes done: $sql\n" );
+			wfDebug( __METHOD__ . ': Writes done: ' . DatabaseBase::generalizeSQL( $sql ) . "\n" );
 			$this->mDoneWrites = true;
 		}