X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=72e6775b7a2643aff242503866d37953f1ff7f6b;hb=1a6de1b24bcc3e5743553533b38ccc324a0f1d53;hp=c4af630786b75fcd2ee70ee235681cac611b9d83;hpb=d4675054cdbbec4024b77546babd480c5813f111;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index c4af630786..72e6775b7a 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -18,11 +18,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that sends SQL queries from the specified file to the database.
+ *
+ * @ingroup Maintenance
+ */
 class MwSql extends Maintenance {
 	public function __construct() {
 		parent::__construct();
@@ -57,24 +63,36 @@ class MwSql extends Maintenance {
 		}
 
 		$wholeLine = '';
-		while ( ( $line = Maintenance::readconsole() ) !== false ) {
+		$newPrompt = '> ';
+		$prompt    = $newPrompt;
+		while ( ( $line = Maintenance::readconsole( $prompt ) ) !== false ) {
+			if( !$line ) {
+				# User simply pressed return key
+				continue;
+			}
 			$done = $dbw->streamStatementEnd( $wholeLine, $line );
 
 			$wholeLine .= $line;
 
 			if ( !$done ) {
+				$wholeLine .= ' ';
+				$prompt = '    -> ';
 				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{
 				$res = $dbw->query( $wholeLine );
 				$this->sqlPrintResult( $res, $dbw );
+				$prompt    = $newPrompt;
 				$wholeLine = '';
 			} catch (DBQueryError $e) {
-				$this->error( $e, true );
+				$doDie = ! Maintenance::posix_isatty( 0 );
+				$this->error( $e, $doDie );
 			}
 		}
 	}