* @ingroup Database
*/
-class PostgresField {
+class PostgresField implements Field {
private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname;
static function fromText($db, $table, $field) {
return $this->type;
}
- function nullable() {
+ function isNullable() {
return $this->nullable;
}
var $mAffectedRows = null;
function __construct( $server = false, $user = false, $password = false, $dbName = false,
- $failFunction = false, $flags = 0 )
+ $flags = 0 )
{
$this->mFlags = $flags;
$this->open( $server, $user, $password, $dbName );
return $this->numRows( $res );
}
- static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) {
- return new DatabasePostgres( $server, $user, $password, $dbName, $failFunction, $flags );
+ static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) {
+ return new DatabasePostgres( $server, $user, $password, $dbName, $flags );
}
/**
* Usually aborts on failure
- * If the failFunction is set to a non-zero integer, returns success
*/
function open( $server, $user, $password, $dbName ) {
# Test for Postgres support, to avoid suppressed fatal error
&& preg_match( '/^\w+$/', $wgDBmwschema )
&& preg_match( '/^\w+$/', $wgDBts2schema )
) {
- $safeschema = $this->quote_ident( $wgDBmwschema );
+ $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
$this->doQuery( "SET search_path = $safeschema, $wgDBts2schema, public" );
}
$PGMINVER = '8.1';
if ( $version < $PGMINVER ) {
print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\n";
- $safeuser = $this->quote_ident( $wgDBuser );
+ $safeuser = $this->addIdentifierQuotes( $wgDBuser );
// Are we connecting as a superuser for the first time?
if ( $superuser ) {
// Are we really a superuser? Check out our rights
$rows = $this->numRows( $res = $this->doQuery( $SQL ) );
if ( !$rows ) {
print '<li>ERROR: Could not read permissions for user "' . htmlspecialchars( $superuser ) . "\"</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
$perms = pg_fetch_result( $res, 0, 0 );
if ( $perms != 1 && $perms != 3 ) {
print '<li>ERROR: the user "' . htmlspecialchars( $superuser ) . '" cannot create other users. ';
print 'Please use a different Postgres user.</li>';
- dieout( '</ul>' );
+ dieout( );
}
print '<li>Creating user <b>' . htmlspecialchars( $wgDBuser ) . '</b>...';
$safepass = $this->addQuotes( $wgDBpassword );
if ( $perms < 1 ) {
print '<li>ERROR: the user "' . htmlspecialchars( $superuser ) . '" cannot create databases. ';
print 'Please use a different Postgres user.</li>';
- dieout( '</ul>' );
+ dieout( );
}
print '<li>Creating database <b>' . htmlspecialchars( $wgDBname ) . '</b>...';
- $safename = $this->quote_ident( $wgDBname );
+ $safename = $this->addIdentifierQuotes( $wgDBname );
$SQL = "CREATE DATABASE $safename OWNER $safeuser ";
$this->doQuery( $SQL );
print "OK</li>\n";
@$this->mConn = pg_connect( $this->makeConnectionString( $connectVars ) );
if ( !$this->mConn ) {
print "<b>FAILED TO CONNECT!</b></li>";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
}
htmlspecialchars( $wgDBname ) . '".';
print 'Please see <a href="http://www.devx.com/opensource/Article/21674/0/page/2">this article</a>';
print " for instructions or ask on #postgresql on irc.freenode.net</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
print '<li>Ensuring that user "' . htmlspecialchars( $wgDBuser ) .
// Setup the schema for this user if needed
$result = $this->schemaExists( $wgDBmwschema );
- $safeschema = $this->quote_ident( $wgDBmwschema );
+ $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
if ( !$result ) {
print '<li>Creating schema <b>' . htmlspecialchars( $wgDBmwschema ) . '</b> ...';
$result = $this->doQuery( "CREATE SCHEMA $safeschema AUTHORIZATION $safeuser" );
if ( !$result ) {
print "<b>FAILED</b>.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
} else {
$res = $this->doQuery( $SQL );
if ( !$res ) {
print "<b>FAILED</b>. Could not set rights for the user.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
$this->doQuery( "SET search_path = $safeschema" );
$rows = $this->numRows( $res );
print '<b>FAILED</b>. Make sure tsearch2 is installed. See <a href="';
print 'http://www.devx.com/opensource/Article/21674/0/page/2">this article</a>';
print " for instructions.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
// Let's check all four, just to be safe
error_reporting( 0 );
$ts2tables = array( 'cfg', 'cfgmap', 'dict', 'parser' );
- $safetsschema = $this->quote_ident( $wgDBts2schema );
+ $safetsschema = $this->addIdentifierQuotes( $wgDBts2schema );
foreach ( $ts2tables as $tname ) {
$SQL = "SELECT count(*) FROM $safetsschema.pg_ts_$tname";
$res = $this->doQuery( $SQL );
print "<b>FAILED</b> to access " . htmlspecialchars( "pg_ts_$tname" ) .
". Make sure that the user \"". htmlspecialchars( $wgDBuser ) .
"\" has SELECT access to all four tsearch2 tables</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
}
$SQL = "SELECT ts_name FROM $safetsschema.pg_ts_cfg WHERE locale = " . $this->addQuotes( $ctype ) ;
print '<b>FAILED</b>. ';
print 'Please make sure that the locale in pg_ts_cfg for "default" is set to "' .
htmlspecialchars( $ctype ) . "\"</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print 'OK</li>';
}
$res = $this->doQuery( $SQL );
if ( !$res ) {
print '<b>FAILED</b>. Specifically, "' . htmlspecialchars( $SQL ) . '" did not work.</li>';
- dieout( '</ul>' );
+ dieout( );
}
print 'OK</li>';
}
if ( !$result ) {
print '<li>Creating schema <b>' . htmlspecialchars( $wgDBmwschema ) . '</b> ...';
error_reporting( 0 );
- $safeschema = $this->quote_ident( $wgDBmwschema );
+ $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
$result = $this->doQuery( "CREATE SCHEMA $safeschema" );
error_reporting( E_ALL );
if ( !$result ) {
'You can try making them the owner of the database, or try creating the schema with a '.
'different user, and then grant access to the "' .
htmlspecialchars( $wgDBuser ) . "\" user.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
} elseif ( $result != $wgDBuser ) {
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<b>FAILED</b>.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
// Set for the rest of this session
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<li>Failed to set timezone</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print '<li>Setting the datestyle to ISO, YMD for user "' . htmlspecialchars( $wgDBuser ) . '" ...';
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<b>FAILED</b>.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
// Set for the rest of this session
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<li>Failed to set datestyle</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
// Fix up the search paths if needed
print '<li>Setting the search path for user "' . htmlspecialchars( $wgDBuser ) . '" ...';
- $path = $this->quote_ident( $wgDBmwschema );
+ $path = $this->addIdentifierQuotes( $wgDBmwschema );
if ( $wgDBts2schema !== $wgDBmwschema ) {
- $path .= ', '. $this->quote_ident( $wgDBts2schema );
+ $path .= ', '. $this->addIdentifierQuotes( $wgDBts2schema );
}
if ( $wgDBmwschema !== 'public' && $wgDBts2schema !== 'public' ) {
$path .= ', public';
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<b>FAILED</b>.</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
print "OK</li>\n";
// Set for the rest of this session
$result = pg_query( $this->mConn, $SQL );
if ( !$result ) {
print "<li>Failed to set search_path</li>\n";
- dieout( '</ul>' );
+ dieout( );
}
define( 'POSTGRES_SEARCHPATH', $path );
}
if ( !$result ) {
print '<b>FAILED</b>. You need to install the language PL/pgSQL in the database <tt>' .
htmlspecialchars( $wgDBname ) . '</tt></li>';
- dieout( '</ul>' );
+ dieout( );
}
} else {
print '<b>FAILED</b>. You need to install the language PL/pgSQL in the database <tt>' .
htmlspecialchars( $wgDBname ) . '</tt></li>';
- dieout( '</ul>' );
+ dieout( );
}
}
print "OK</li>\n";
return $this->mLastResult;
}
- function queryIgnore( $sql, $fname = '' ) {
+ function queryIgnore( $sql, $fname = 'DatabasePostgres::queryIgnore' ) {
return $this->query( $sql, $fname, true );
}
return true;
}
return false;
-
}
/**
* Return the next in a sequence, save the value for retrieval via insertId()
*/
function nextSequenceValue( $seqName ) {
- $safeseq = preg_replace( "/'/", "''", $seqName );
+ $safeseq = str_replace( "'", "''", $seqName );
$res = $this->query( "SELECT nextval('$safeseq')" );
$row = $this->fetchRow( $res );
$this->mInsertId = $row[0];
* Return the current value of a sequence. Assumes it has been nextval'ed in this session.
*/
function currentSequenceValue( $seqName ) {
- $safeseq = preg_replace( "/'/", "''", $seqName );
+ $safeseq = str_replace( "'", "''", $seqName );
$res = $this->query( "SELECT currval('$safeseq')" );
$row = $this->fetchRow( $res );
$currval = $row[0];
* Query whether a given schema exists. Returns the name of the owner
*/
function schemaExists( $schema ) {
- $eschema = preg_replace( "/'/", "''", $schema );
+ $eschema = str_replace( "'", "''", $schema );
$SQL = "SELECT rolname FROM pg_catalog.pg_namespace n, pg_catalog.pg_roles r "
."WHERE n.nspowner=r.oid AND n.nspname = '$eschema'";
$res = $this->query( $SQL );
return $sql;
}
- function setup_database() {
- global $wgDBmwschema, $wgDBuser;
-
- // Make sure that we can write to the correct schema
- // If not, Postgres will happily and silently go to the next search_path item
- $ctest = 'mediawiki_test_table';
- $safeschema = $this->quote_ident( $wgDBmwschema );
- if ( $this->tableExists( $ctest, $wgDBmwschema ) ) {
- $this->doQuery( "DROP TABLE $safeschema.$ctest" );
- }
- $SQL = "CREATE TABLE $safeschema.$ctest(a int)";
- $olde = error_reporting( 0 );
- $res = $this->doQuery( $SQL );
- error_reporting( $olde );
- if ( !$res ) {
- print '<b>FAILED</b>. Make sure that the user "' . htmlspecialchars( $wgDBuser ) .
- '" can write to the schema "' . htmlspecialchars( $wgDBmwschema ) . "\"</li>\n";
- dieout( '' ); # Will close the main list <ul> and finish the page.
- }
- $this->doQuery( "DROP TABLE $safeschema.$ctest" );
-
- $res = $this->sourceFile( "../maintenance/postgres/tables.sql" );
- if ( $res === true ) {
- print " done.</li>\n";
- } else {
- print " <b>FAILED</b></li>\n";
- dieout( htmlspecialchars( $res ) );
- }
-
- echo '<li>Populating interwiki table... ';
- # Avoid the non-standard "REPLACE INTO" syntax
- $f = fopen( "../maintenance/interwiki.sql", 'r' );
- if ( !$f ) {
- print '<b>FAILED</b></li>';
- dieout( 'Could not find the interwiki.sql file' );
- }
- # We simply assume it is already empty as we have just created it
- $SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES ";
- while ( !feof( $f ) ) {
- $line = fgets( $f, 1024 );
- $matches = array();
- if ( !preg_match( '/^\s*(\(.+?),(\d)\)/', $line, $matches ) ) {
- continue;
- }
- $this->query( "$SQL $matches[1],$matches[2])" );
- }
- print " successfully populated.</li>\n";
-
- $this->doQuery( 'COMMIT' );
- }
-
function encodeBlob( $b ) {
return new Blob( pg_escape_bytea( $this->mConn, $b ) );
}
return "'" . pg_escape_string( $this->mConn, $s ) . "'";
}
- function quote_ident( $s ) {
- return '"' . preg_replace( '/"/', '""', $s ) . '"';
- }
-
/**
* Postgres specific version of replaceVars.
* Calls the parent version in Database.php
dépôts / lhc / web / wiklou.git / blobdiff