Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted r89393. A single Database object certainly should not be attempting to manage multiple database connections, that is the job of LBFactory/LoadBalancer. I would like to see $wgSharedDB managed by LBFactory instead, for all DBMSes. Then the cruft in Database::tableName() can be removed.

Browse source 
r89393 caused tableExists() etc. to be completely broken, so PostgreSQL upgrade was broken too, see CR.
This commit is contained in:
Tim Starling 2011-06-10 07:36:22 +00:00
parent 0a12727c8c
commit 150bfa181e
2 changed files with 13 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CREDITS
View file

@ -108,7 +108,6 @@ following names for their contribution to the product.
* Lejonel * Lejonel
* liangent * liangent
* Louperivois * Louperivois
* Luca Fulchir
* Lucas Garczewski * Lucas Garczewski
* Luigi Corsaro * Luigi Corsaro
* Manuel Menal * Manuel Menal

153
includes/db/DatabasePostgres.php
View file

@ -7,7 +7,7 @@
*/ */
class PostgresField implements Field { class PostgresField implements Field {
private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname, $sharedmConn = null; private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname;
/** /**
* @param $db DatabaseBase * @param $db DatabaseBase
@ -152,7 +152,7 @@ class DatabasePostgres extends DatabaseBase {
throw new DBConnectionError( $this, "Postgres functions missing, have you compiled PHP with the --with-pgsql option?\n (Note: if you recently installed PHP, you may need to restart your webserver and database)\n" ); throw new DBConnectionError( $this, "Postgres functions missing, have you compiled PHP with the --with-pgsql option?\n (Note: if you recently installed PHP, you may need to restart your webserver and database)\n" );
} }
global $wgDBport, $wgSharedDB; global $wgDBport;
if ( !strlen( $user ) ) { # e.g. the class is being loaded if ( !strlen( $user ) ) { # e.g. the class is being loaded
return; return;
@ -189,30 +189,6 @@ class DatabasePostgres extends DatabaseBase {
throw new DBConnectionError( $this, $phpError ); throw new DBConnectionError( $this, $phpError );
} }
if( $wgSharedDB ) {
$connectVars = array(
'dbname' => $wgSharedDB,
'user' => $user,
'password' => $password );
if ($server!=false && $server!="") {
$connectVars['host'] = $server;
}
if ($port!=false && $port!="") {
$connectVars['port'] = $port;
}
$connectString = $this->makeConnectionString( $connectVars, PGSQL_CONNECT_FORCE_NEW );
$this->installErrorHandler();
$this->sharedmConn = pg_connect( $connectString );
$phpError = $this->restoreErrorHandler();
if ( $this->sharedmConn == false ) {
wfDebug( "SharedDB connection error\n" );
wfDebug( "Server: $server, Database: $wgSharedDB, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n" );
wfDebug( $this->lastError()."\n" );
$this->close();
throw new DBConnectionError( $this, $phpError );
}
}
$this->mOpened = true; $this->mOpened = true;
global $wgCommandLineMode; global $wgCommandLineMode;
@ -258,56 +234,19 @@ class DatabasePostgres extends DatabaseBase {
* Returns success, true if already closed * Returns success, true if already closed
*/ */
function close() { function close() {
$mainConn = true; $this->mOpened = false;
$sharedConn = true; if ( $this->mConn ) {
if ( $this->mConn ) { return pg_close( $this->mConn );
$mainConn = pg_close ( $this->mConn ); } else {
return true;
} }
if ( isset( $this->sharedmConn ) && $this->sharedmConn ) {
$sharedConn = pg_close ( $this->sharedmConn );
}
$this->mOpened = !($mainConn && $sharedConn);
return !$this->mOpened;
} }
function doQuery( $sql ) { function doQuery( $sql ) {
global $wgSharedDB;
if ( function_exists( 'mb_convert_encoding' ) ) { if ( function_exists( 'mb_convert_encoding' ) ) {
$sql = mb_convert_encoding( $sql, 'UTF-8' ); $sql = mb_convert_encoding( $sql, 'UTF-8' );
} }
# we can find the shared tables after FROM or UPDATE statements. $this->mLastResult = pg_query( $this->mConn, $sql );
$FROMpos = strpos( $sql, 'FROM' );
if ( $FROMpos === false ) {
$FROMpos = strpos( $sql, 'UPDATE' );
if ( $FROMpos === false ) {
# does this query even exists?
$this->mLastResult = pg_query( $this->mConn, $sql );
$this->mAffectedRows = null; // use pg_affected_rows(mLastResult)
return $this->mLastResult;
}
}
# check if we should connect to the shared database
# skip FROM/UPDATE statement
$FROMquery = substr( $sql, $FROMpos + ($sql[$FROMpos] == 'F' ? 4 : 6) );
$trimmed = trim( $FROMquery );
$FROMquery = $trimmed;
# skip eventual comment and spaces
if ( substr( $FROMquery, 0, 2 ) == '/*' ) {
$FROMquery = substr( $FROMquery, strpos( $FROMquery, '*/') + 2 );
$trimmed = trim( $FROMquery );
$FROMquery = $trimmed;
}
# select only dbname
$FROMquery = substr( $FROMquery, 0, strpos($FROMquery, ' ') );
$FROMvalue = explode( '.', $FROMquery );
# db is always quoted, compare it to wgSharedDB
if ( $FROMvalue[0] == "\"$wgSharedDB\"" ) {
# shared db requested. switch connection
$this->mLastResult = pg_query( $this->sharedmConn, $sql );
} else {
# main db: basic query
$this->mLastResult = pg_query( $this->mConn, $sql );
}
$this->mAffectedRows = null; // use pg_affected_rows(mLastResult) $this->mAffectedRows = null; // use pg_affected_rows(mLastResult)
return $this->mLastResult; return $this->mLastResult;
} }
@ -671,81 +610,15 @@ class DatabasePostgres extends DatabaseBase {
} }
function tableName( $name, $quoted = true ) { function tableName( $name, $quoted = true ) {
global $wgSharedDB, $wgSharedPrefix, $wgSharedTables, $wgDBmwschema;
# Replace reserved words with better ones # Replace reserved words with better ones
switch( $name ) { switch( $name ) {
case 'user': case 'user':
$name = 'mwuser'; return 'mwuser';
break; case 'text':
case '"user"': return 'pagecontent';
$name = '"mwuser"'; default:
break; return parent::tableName( $name, $quoted );
case 'text':
$name = 'pagecontent';
break;
case 'text':
$name = 'pagecontent';
break;
} }
# Skip the entire process when we have a string quoted on both ends.
# Note that we check the end so that we will still quote any use of
# use of `database`.table. But won't break things if someone wants
# to query a database table with a dot in the name.
if ( $name[0] == '"' && substr( $name, -1, 1 ) == '"' ) {
return $name;
}
# Lets test for any bits of text that should never show up in a table
# name. Basically anything like JOIN or ON which are actually part of
# SQL queries, but may end up inside of the table value to combine
# sql. Such as how the API is doing.
# Note that we use a whitespace test rather than a \b test to avoid
# any remote case where a word like on may be inside of a table name
# surrounded by symbols which may be considered word breaks.
if( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) {
return $name;
}
# Split database and table into proper variables.
# We reverse the explode so that database.table and table both output
# the correct table.
$dbDetails = array_reverse( explode( '.', $name, 2 ) );
if ( isset( $dbDetails[1] ) ) {
@list( $table, $database ) = $dbDetails;
} else {
@list( $table ) = $dbDetails;
}
$prefix = $this->mTablePrefix; # Default prefix
# A database name has been specified in input. Quote the table name
# because we don't want any prefixes added.
if( isset($database) ) {
$table = ( $table[0] == '"' ? $table : "\"{$table}\"" );
}
# Note that we use the long format because php will complain in in_array if
# the input is not an array, and will complain in is_array if it is not set.
if( !isset( $database ) # Don't use shared database if pre selected.
&& isset( $wgSharedDB ) # We have a shared database
&& $table[0] != '"' # Paranoia check to prevent shared tables listing '`table`'
&& isset( $wgSharedTables )
&& is_array( $wgSharedTables )
&& in_array( $table, $wgSharedTables ) ) { # A shared table is selected
$database = $wgSharedDB;
$prefix = isset( $wgSharedPrefix ) ? $wgSharedPrefix : $prefix;
}
# Quote the $database and $table and apply the prefix if not quoted.
if( isset($database) ) {
$database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
}
$table = ( $table[0] == '"' ? $table : "\"{$prefix}{$table}\"" );
# Merge our database and table into our final table name.
$tableName = ( isset($database) ? "{$database}.\"{$wgDBmwschema}\".{$table}" : "{$table}" );
# We're finished, return.
return $tableName;
} }
/** /**