function encodeBlob($b) {
return $b;
}
+
+ /**
+ * Read and execute SQL commands from a file.
+ * Returns true on success, error string on failure
+ */
+ function sourceFile( $filename ) {
+ $fp = fopen( $filename, 'r' );
+ if ( false === $fp ) {
+ return "Could not open \"{$fname}\".\n";
+ }
+
+ $cmd = "";
+ $done = false;
+
+ while ( ! feof( $fp ) ) {
+ $line = trim( fgets( $fp, 1024 ) );
+ $sl = strlen( $line ) - 1;
+
+ if ( $sl < 0 ) { continue; }
+ if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
+
+ if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
+ $done = true;
+ $line = substr( $line, 0, $sl );
+ }
+
+ if ( '' != $cmd ) { $cmd .= ' '; }
+ $cmd .= "$line\n";
+
+ if ( $done ) {
+ $cmd = str_replace(';;', ";", $cmd);
+ $cmd = $this->replaceVars( $cmd );
+ $res = $this->query( $cmd, 'dbsource', true );
+
+ if ( false === $res ) {
+ $err = $this->mLastError();
+ return "Query \"{$cmd}\" failed with error code \"$err\".\n";
+ }
+
+ $cmd = '';
+ $done = false;
+ }
+ }
+ fclose( $fp );
+ return true;
+ }
+
+ /**
+ * Replace variables in sourced SQL
+ */
+ function replaceVars( $ins ) {
+ $varnames = array(
+ 'wgDBserver', 'wgDBname', 'wgDBintlname', 'wgDBuser',
+ 'wgDBpassword', 'wgDBsqluser', 'wgDBsqlpassword',
+ 'wgDBadminuser', 'wgDBadminpassword',
+ );
+
+ // Ordinary variables
+ foreach ( $varnames as $var ) {
+ if( isset( $GLOBALS[$var] ) ) {
+ $val = addslashes( $GLOBALS[$var] );
+ $ins = str_replace( '{$' . $var . '}', $val, $ins );
+ $ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
+ $ins = str_replace( '/*$' . $var . '*/', $val, $ins );
+ }
+ }
+
+ // Table prefixes
+ $ins = preg_replace_callback( '/\/\*(?:\$wgDBprefix|_)\*\/([a-z_]*)/',
+ array( &$this, 'tableNameCallback' ), $ins );
+ return $ins;
+ }
+
+ /**
+ * Table name callback
+ * @access private
+ */
+ function tableNameCallback( $matches ) {
+ return $this->tableName( $matches[1] );
+ }
+
}
/**
function seek( $row ) {
$this->db->dataSeek( $this->result, $row );
}
+
}
+
#------------------------------------------------------------------------------
# Global functions
#------------------------------------------------------------------------------
}
}
-function replacevars( $ins ) {
- $varnames = array(
- 'wgDBserver', 'wgDBname', 'wgDBintlname', 'wgDBuser',
- 'wgDBpassword', 'wgDBsqluser', 'wgDBsqlpassword',
- 'wgDBadminuser', 'wgDBadminpassword', 'wgDBprefix'
- );
-
- foreach ( $varnames as $var ) {
- if( isset( $GLOBALS[$var] ) ) {
- $val = addslashes( $GLOBALS[$var] );
- $ins = str_replace( '{$' . $var . '}', $val, $ins );
- $ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
- $ins = str_replace( '/*$' . $var . '*/', $val, $ins );
- }
- }
- return $ins;
-}
-
#
# Read and execute SQL commands from a file
#
-function dbsource( $fname, $database = false ) {
- $fp = fopen( $fname, 'r' );
- if ( false === $fp ) {
- print "Could not open \"{$fname}\".\n";
- exit();
- }
-
- $cmd = "";
- $done = false;
-
- while ( ! feof( $fp ) ) {
- $line = trim( fgets( $fp, 1024 ) );
- $sl = strlen( $line ) - 1;
-
- if ( $sl < 0 ) { continue; }
- if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
-
- if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
- $done = true;
- $line = substr( $line, 0, $sl );
- }
-
- if ( '' != $cmd ) { $cmd .= ' '; }
- $cmd .= "$line\n";
-
- if ( $done ) {
- $cmd = str_replace(';;', ";", $cmd);
- $cmd = replacevars( $cmd );
- if( $database )
- $res = $database->query( $cmd, 'dbsource', true );
- else
- $res = mysql_query( $cmd );
-
- if ( false === $res ) {
- $err = mysql_error();
- print "Query \"{$cmd}\" failed with error code \"$err\".\n";
- exit();
- }
-
- $cmd = '';
- $done = false;
+function dbsource( $fname, $db = false ) {
+ if ( !$db ) {
+ // Try $wgDatabase, which is used in the install and update scripts
+ global $wgDatabase;
+ if ( isset( $wgDatabase ) ) {
+ $db =& $wgDatabase;
+ } else {
+ // No? Well, we must be outside of those scripts, so use the standard method
+ $db =& wfGetDB( DB_MASTER );
}
}
- fclose( $fp );
+ $error = $db->sourceFile( $fname );
+ if ( $error !== true ) {
+ print $error;
+ exit(1);
+ }
}
# Obsolete, use Database::fieldExists()
echo "\n";
}
-do_all_updates();
+if ( isset( $options['doshared'] ) ) {
+ $doShared = true;
+} else {
+ $doShared = false;
+}
+
+do_all_updates( $doShared );
print "Done.\n";
echo "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n";
}
-function do_all_updates() {
- global $wgNewTables, $wgNewFields, $wgRenamedTables;
+function do_all_updates( $doShared = false ) {
+ global $wgNewTables, $wgNewFields, $wgRenamedTables, $wgSharedDB, $wgDatabase;
+
+ $doUser = !$wgSharedDB || $doShared;
# Rename tables
foreach ( $wgRenamedTables as $tableRecord ) {
# Add missing fields
foreach ( $wgNewFields as $fieldRecord ) {
- add_field( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+ if ( $fieldRecord[0] != 'user' || $doUser ) {
+ add_field( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+ }
flush();
}
do_old_links_update(); flush();
do_image_name_unique_update(); flush();
do_watchlist_update(); flush();
- do_user_update(); flush();
+ if ( $doUser ) {
+ do_user_update(); flush();
+ }
###### do_copy_newtalk_to_watchlist(); flush();
do_logging_encoding(); flush();
do_drop_img_type(); flush();
- do_user_unique_update(); flush();
+ if ( $doUser ) {
+ do_user_unique_update(); flush();
+ }
do_user_groups_update(); flush();
do_watchlist_null(); flush();