From: Antoine Musso <hashar@free.fr>
Date: Thu, 25 Oct 2012 11:00:03 +0000 (+0200)
Subject: (bug 37020) sql.php with readline eats semicolon
X-Git-Tag: 1.31.0-rc.0~21868^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=c8e136dbbb9a72393cbb8aca22e791d44fa0a612;p=lhc%2Fweb%2Fwiklou.git

(bug 37020) sql.php with readline eats semicolon

The database delimitor is now appended to the command before it is saved
in readline history.

Change-Id: Ie6bbac2d74e2e5df3910c5612adbd373a9c4695b
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 8eb6a7612f..29bef9f087 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -48,6 +48,8 @@ production.
   compatibility. This also works with Squid in reverse-proxy mode. If you wish 
   to support Squid configured in forward-proxy mode, set 
   $wgSquidPurgeUseHostHeader to false.
+* (bug 37020) sql.php with readline eats semicolon
+
 
 === API changes in 1.21 ===
 * prop=revisions can now report the contentmodel and contentformat, see docs/contenthandler.txt
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 04e98d918d..6cbc482baf 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -72,7 +72,9 @@ class MwSql extends Maintenance {
 				continue;
 			}
 			if ( $useReadline ) {
-				readline_add_history( $wholeLine );
+				# Delimiter is eated by streamStatementEnd, we add it
+				# up in the history (bug 37020)
+				readline_add_history( $wholeLine . $dbw->getDelimiter() );
 				readline_write_history( $historyFile );
 			}
 			try{