$sqlx = substr( $commentedSql, 0, 500 );
$sqlx = strtr( $sqlx, "\t\n", ' ' );
-
$master = $isMaster ? 'master' : 'slave';
wfDebug( "Query {$this->mDBname} ($cnt) ($master): $sqlx\n" );
}
* @param $inputCallback Callback: Optional function called for each complete line (ended with ;) sent
* @return bool|string
*/
- function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
+ public function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
$fname = 'DatabaseBase::sourceStream', $inputCallback = false )
{
$cmd = '';
/**
* Called by sourceStream() to check if we've reached a statement end
*
- * @param $sql String: SQL assembled so far
- * @param $newLine String: New line about to be added to $sql
- * @returns Bool: Whether $newLine contains end of the statement
+ * @param $sql String SQL assembled so far
+ * @param $newLine String New line about to be added to $sql
+ * @return Bool Whether $newLine contains end of the statement
*/
- protected function streamStatementEnd( &$sql, &$newLine ) {
+ public function streamStatementEnd( &$sql, &$newLine ) {
if ( $this->delimiter ) {
$prev = $newLine;
$newLine = preg_replace( '/' . preg_quote( $this->delimiter, '/' ) . '$/', '', $newLine );
if ( $this->hasArg() ) {
$fileName = $this->getArg();
$file = fopen( $fileName, 'r' );
- $promptCallback = false;
} else {
$file = $this->getStdin();
- $promptObject = new SqlPromptPrinter( "> " );
- $promptCallback = $promptObject->cb();
}
- if ( !$file )
+ if ( !$file ) {
$this->error( "Unable to open input file", true );
+ }
+
+ $useReadline = function_exists( 'readline_add_history' )
+ && Maintenance::posix_isatty( 0 /*STDIN*/ );
+
+ if ( $useReadline ) {
+ global $IP;
+ $historyFile = isset( $_ENV['HOME'] ) ?
+ "{$_ENV['HOME']}/.mwsql_history" : "$IP/maintenance/.mwsql_history";
+ readline_read_history( $historyFile );
+ }
$dbw = wfGetDB( DB_MASTER );
- $error = $dbw->sourceStream( $file, $promptCallback, array( $this, 'sqlPrintResult' ) );
- if ( $error !== true ) {
- $this->error( $error, true );
- } else {
- exit( 0 );
+ $wholeLine = '';
+ while ( ( $line = Maintenance::readconsole() ) !== false ) {
+ $done = $dbw->streamStatementEnd( $wholeLine, $line );
+
+ $wholeLine .= $line;
+
+ if ( !$done ) {
+ continue;
+ }
+ if ( $useReadline ) {
+ readline_add_history( $wholeLine );
+ readline_write_history( $historyFile );
+ }
+ try{
+ $res = $dbw->query( $wholeLine );
+ $this->sqlPrintResult( $res, $dbw );
+ $wholeLine = '';
+ } catch (DBQueryError $e) {
+ $this->error( $e, true );
+ }
}
}
/**
* Print the results, callback for $db->sourceStream()
- * @param $res The results object
- * @param $db Database object
+ * @param $res ResultWrapper The results object
+ * @param $db DatabaseBase object
*/
public function sqlPrintResult( $res, $db ) {
if ( !$res ) {
}
}
+ /**
+ * @return int DB_TYPE constant
+ */
public function getDbType() {
return Maintenance::DB_ADMIN;
}
}
-class SqlPromptPrinter {
- function __construct( $prompt ) {
- $this->prompt = $prompt;
- }
-
- function cb() {
- return array( $this, 'printPrompt' );
- }
-
- function printPrompt() {
- echo $this->prompt;
- }
-}
-
$maintClass = "MwSql";
require_once( RUN_MAINTENANCE_IF_MAIN );