PostgreSQL: Improve SQL error handling
[lhc/web/wiklou.git] / includes / db / DatabasePostgres.php
index 86492b0..1f1d7ed 100644 (file)
@@ -9,8 +9,14 @@
 class PostgresField implements Field {
        private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname;
 
-       static function fromText($db, $table, $field) {
-       global $wgDBmwschema;
+       /**
+        * @param $db DatabaseBase
+        * @param  $table
+        * @param  $field
+        * @return null|PostgresField
+        */
+       static function fromText( $db, $table, $field ) {
+               global $wgDBmwschema;
 
                $q = <<<SQL
 SELECT
@@ -33,7 +39,7 @@ AND relname=%s
 AND attname=%s;
 SQL;
 
-               $table = $db->tableName( $table );
+               $table = $db->tableName( $table, 'raw' );
                $res = $db->query(
                        sprintf( $q,
                                $db->addQuotes( $wgDBmwschema ),
@@ -100,13 +106,6 @@ class DatabasePostgres extends DatabaseBase {
        var $numeric_version = null;
        var $mAffectedRows = null;
 
-       function __construct( $server = false, $user = false, $password = false, $dbName = false,
-               $flags = 0 )
-       {
-               $this->mFlags = $flags;
-               $this->open( $server, $user, $password, $dbName );
-       }
-
        function getType() {
                return 'postgres';
        }
@@ -144,12 +143,9 @@ class DatabasePostgres extends DatabaseBase {
                return $this->numRows( $res );
        }
 
-       static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) {
-               return new DatabasePostgres( $server, $user, $password, $dbName, $flags );
-       }
-
        /**
         * Usually aborts on failure
+        * @return DatabaseBase|null
         */
        function open( $server, $user, $password, $dbName ) {
                # Test for Postgres support, to avoid suppressed fatal error
@@ -162,9 +158,9 @@ class DatabasePostgres extends DatabaseBase {
                if ( !strlen( $user ) ) { # e.g. the class is being loaded
                        return;
                }
-               $this->close();
+
                $this->mServer = $server;
-               $this->mPort = $port = $wgDBport;
+               $port = $wgDBport;
                $this->mUser = $user;
                $this->mPassword = $password;
                $this->mDBname = $dbName;
@@ -180,17 +176,21 @@ class DatabasePostgres extends DatabaseBase {
                if ( $port != false && $port != '' ) {
                        $connectVars['port'] = $port;
                }
-               $connectString = $this->makeConnectionString( $connectVars, PGSQL_CONNECT_FORCE_NEW );
+               $this->connectString = $this->makeConnectionString( $connectVars, PGSQL_CONNECT_FORCE_NEW );
+               $this->reOpen();
+       }
 
+       function reOpen() {
+               $this->close();
                $this->installErrorHandler();
-               $this->mConn = pg_connect( $connectString );
+               $this->mConn = pg_connect( $this->connectString );
                $phpError = $this->restoreErrorHandler();
 
                if ( !$this->mConn ) {
                        wfDebug( "DB connection error\n" );
                        wfDebug( "Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n" );
                        wfDebug( $this->lastError() . "\n" );
-                       throw new DBConnectionError( $this, $phpError );
+                       throw new DBConnectionError( $this, str_replace( "\n", ' ', $phpError ) );
                }
 
                $this->mOpened = true;
@@ -201,21 +201,35 @@ class DatabasePostgres extends DatabaseBase {
                        $this->doQuery( "SET client_min_messages = 'ERROR'" );
                }
 
-               $this->doQuery( "SET client_encoding='UTF8'" );
+               $this->query( "SET client_encoding='UTF8'", __METHOD__ );
+               $this->query( "SET datestyle = 'ISO, YMD'", __METHOD__ );
+               $this->query( "SET timezone = 'GMT'", __METHOD__ );
+               $this->query( "SET standard_conforming_strings = on", __METHOD__ );
 
-               global $wgDBmwschema, $wgDBts2schema;
-               if ( isset( $wgDBmwschema ) && isset( $wgDBts2schema )
-                       && $wgDBmwschema !== 'mediawiki'
-                       && preg_match( '/^\w+$/', $wgDBmwschema )
-                       && preg_match( '/^\w+$/', $wgDBts2schema )
-               ) {
+               global $wgDBmwschema;
+               if ( $this->schemaExists( $wgDBmwschema ) ) {
                        $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
-                       $this->doQuery( "SET search_path = $safeschema, $wgDBts2schema, public" );
+                       $this->doQuery( "SET search_path = $safeschema" );
+               } else {
+                       $this->doQuery( "SET search_path = public" );
                }
 
                return $this->mConn;
        }
 
+       /**
+        * Postgres doesn't support selectDB in the same way MySQL does. So if the
+        * DB name doesn't match the open connection, open a new one
+        * @return
+        */
+       function selectDB( $db ) {
+               if ( $this->mDBname !== $db ) {
+                       return (bool)$this->open( $this->mServer, $this->mUser, $this->mPassword, $db );
+               } else {
+                       return true;
+               }
+       }
+
        function makeConnectionString( $vars ) {
                $s = '';
                foreach ( $vars as $name => $value ) {
@@ -224,333 +238,16 @@ class DatabasePostgres extends DatabaseBase {
                return $s;
        }
 
-
-       function initial_setup( $superuser, $password, $dbName ) {
-               // If this is the initial connection, setup the schema stuff and possibly create the user
-               global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBmwschema, $wgDBts2schema;
-
-               $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
-                       $SQL = "SELECT
-                      CASE WHEN usesuper IS TRUE THEN
-                      CASE WHEN usecreatedb IS TRUE THEN 3 ELSE 1 END
-                      ELSE CASE WHEN usecreatedb IS TRUE THEN 2 ELSE 0 END
-                    END AS rights
-                    FROM pg_catalog.pg_user WHERE usename = " . $this->addQuotes( $superuser );
-                       $rows = $this->numRows( $res = $this->doQuery( $SQL ) );
-                       if ( !$rows ) {
-                               print '<li>ERROR: Could not read permissions for user "' . htmlspecialchars( $superuser ) . "\"</li>\n";
-                               dieout( );
-                       }
-                       $perms = pg_fetch_result( $res, 0, 0 );
-
-                       $SQL = "SELECT 1 FROM pg_catalog.pg_user WHERE usename = " . $this->addQuotes( $wgDBuser );
-                       $rows = $this->numRows( $this->doQuery( $SQL ) );
-                       if ( $rows ) {
-                               print '<li>User "' . htmlspecialchars( $wgDBuser ) . '" already exists, skipping account creation.</li>';
-                       } else {
-                               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( );
-                               }
-                               print '<li>Creating user <b>' . htmlspecialchars( $wgDBuser ) . '</b>...';
-                               $safepass = $this->addQuotes( $wgDBpassword );
-                               $SQL = "CREATE USER $safeuser NOCREATEDB PASSWORD $safepass";
-                               $this->doQuery( $SQL );
-                               print "OK</li>\n";
-                       }
-                       // User now exists, check out the database
-                       if ( $dbName != $wgDBname ) {
-                               $SQL = "SELECT 1 FROM pg_catalog.pg_database WHERE datname = " . $this->addQuotes( $wgDBname );
-                               $rows = $this->numRows( $this->doQuery( $SQL ) );
-                               if ( $rows ) {
-                                       print '<li>Database "' . htmlspecialchars( $wgDBname ) . '" already exists, skipping database creation.</li>';
-                               } else {
-                                       if ( $perms < 1 ) {
-                                               print '<li>ERROR: the user "' . htmlspecialchars( $superuser ) . '" cannot create databases. ';
-                                               print 'Please use a different Postgres user.</li>';
-                                               dieout( );
-                                       }
-                                       print '<li>Creating database <b>' . htmlspecialchars( $wgDBname ) . '</b>...';
-                                       $safename = $this->addIdentifierQuotes( $wgDBname );
-                                       $SQL = "CREATE DATABASE $safename OWNER $safeuser ";
-                                       $this->doQuery( $SQL );
-                                       print "OK</li>\n";
-                                       // Hopefully tsearch2 and plpgsql are in template1...
-                               }
-
-                               // Reconnect to check out tsearch2 rights for this user
-                               print '<li>Connecting to "' . htmlspecialchars( $wgDBname ) . '" as superuser "' .
-                                       htmlspecialchars( $superuser ) . '" to check rights...';
-
-                               $connectVars = array();
-                               if ( $this->mServer != false && $this->mServer != '' ) {
-                                       $connectVars['host'] = $this->mServer;
-                               }
-                               if ( $this->mPort != false && $this->mPort != '' ) {
-                                       $connectVars['port'] = $this->mPort;
-                               }
-                               $connectVars['dbname'] = $wgDBname;
-                               $connectVars['user'] = $superuser;
-                               $connectVars['password'] = $password;
-
-                               @$this->mConn = pg_connect( $this->makeConnectionString( $connectVars ) );
-                               if ( !$this->mConn ) {
-                                       print "<b>FAILED TO CONNECT!</b></li>";
-                                       dieout( );
-                               }
-                               print "OK</li>\n";
-                       }
-
-                       if ( $this->numeric_version < 8.3 ) {
-                               // Tsearch2 checks
-                               print '<li>Checking that tsearch2 is installed in the database "' .
-                                       htmlspecialchars( $wgDBname ) . '"...';
-                               if ( !$this->tableExists( 'pg_ts_cfg', $wgDBts2schema ) ) {
-                                       print '<b>FAILED</b>. tsearch2 must be installed in the database "' .
-                                               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( );
-                               }
-                               print "OK</li>\n";
-                               print '<li>Ensuring that user "' . htmlspecialchars( $wgDBuser ) .
-                                       '" has select rights on the tsearch2 tables...';
-                               foreach ( array( 'cfg', 'cfgmap', 'dict', 'parser' ) as $table ) {
-                                       $SQL = "GRANT SELECT ON pg_ts_$table TO $safeuser";
-                                       $this->doQuery( $SQL );
-                               }
-                               print "OK</li>\n";
-                       }
-
-                       // Setup the schema for this user if needed
-                       $result = $this->schemaExists( $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( );
-                               }
-                               print "OK</li>\n";
-                       } else {
-                               print "<li>Schema already exists, explicitly granting rights...\n";
-                               $safeschema2 = $this->addQuotes( $wgDBmwschema );
-                               $SQL = "SELECT 'GRANT ALL ON '||pg_catalog.quote_ident(relname)||' TO $safeuser;'\n".
-                                       "FROM pg_catalog.pg_class p, pg_catalog.pg_namespace n\n".
-                                       "WHERE relnamespace = n.oid AND n.nspname = $safeschema2\n".
-                                       "AND p.relkind IN ('r','S','v')\n";
-                               $SQL .= "UNION\n";
-                               $SQL .= "SELECT 'GRANT ALL ON FUNCTION '||pg_catalog.quote_ident(proname)||'('||\n".
-                                       "pg_catalog.oidvectortypes(p.proargtypes)||') TO $safeuser;'\n".
-                                       "FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n\n".
-                                       "WHERE p.pronamespace = n.oid AND n.nspname = $safeschema2";
-                               $res = $this->doQuery( $SQL );
-                               if ( !$res ) {
-                                       print "<b>FAILED</b>. Could not set rights for the user.</li>\n";
-                                       dieout( );
-                               }
-                               $this->doQuery( "SET search_path = $safeschema" );
-                               $rows = $this->numRows( $res );
-                               while ( $rows ) {
-                                       $rows--;
-                                       $this->doQuery( pg_fetch_result( $res, $rows, 0 ) );
-                               }
-                               print "OK</li>";
-                       }
-
-                       // Install plpgsql if needed
-                       $this->setup_plpgsql();
-
-                       return true; // Reconnect as regular user
-
-               } // end superuser
-
-               if ( !defined( 'POSTGRES_SEARCHPATH' ) ) {
-
-                       if ( $this->numeric_version < 8.3 ) {
-                               // Do we have the basic tsearch2 table?
-                               print '<li>Checking for tsearch2 in the schema "' . htmlspecialchars( $wgDBts2schema ) . '"...';
-                               if ( !$this->tableExists( 'pg_ts_dict', $wgDBts2schema ) ) {
-                                       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( );
-                               }
-                               print "OK</li>\n";
-
-                               // Does this user have the rights to the tsearch2 tables?
-                               $ctype = pg_fetch_result( $this->doQuery( 'SHOW lc_ctype' ), 0, 0 );
-                               print '<li>Checking tsearch2 permissions...';
-                               // Let's check all four, just to be safe
-                               error_reporting( 0 );
-                               $ts2tables = array( 'cfg', 'cfgmap', 'dict', 'parser' );
-                               $safetsschema = $this->addIdentifierQuotes( $wgDBts2schema );
-                               foreach ( $ts2tables as $tname ) {
-                                       $SQL = "SELECT count(*) FROM $safetsschema.pg_ts_$tname";
-                                       $res = $this->doQuery( $SQL );
-                                       if ( !$res ) {
-                                               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( );
-                                       }
-                               }
-                               $SQL = "SELECT ts_name FROM $safetsschema.pg_ts_cfg WHERE locale = " . $this->addQuotes( $ctype ) ;
-                               $SQL .= " ORDER BY CASE WHEN ts_name <> 'default' THEN 1 ELSE 0 END";
-                               $res = $this->doQuery( $SQL );
-                               error_reporting( E_ALL );
-                               if ( !$res ) {
-                                       print "<b>FAILED</b>. Could not determine the tsearch2 locale information</li>\n";
-                                       dieout("</ul>");
-                               }
-                               print 'OK</li>';
-
-                               // Will the current locale work? Can we force it to?
-                               print '<li>Verifying tsearch2 locale with ' . htmlspecialchars( $ctype ) . '...';
-                               $rows = $this->numRows( $res );
-                               $resetlocale = 0;
-                               if ( !$rows ) {
-                                       print "<b>not found</b></li>\n";
-                                       print '<li>Attempting to set default tsearch2 locale to "' . htmlspecialchars( $ctype ) . '"...';
-                                       $resetlocale = 1;
-                               } else {
-                                       $tsname = pg_fetch_result( $res, 0, 0 );
-                                       if ( $tsname != 'default' ) {
-                                               print "<b>not set to default (" . htmlspecialchars( $tsname ) . ")</b>";
-                                               print "<li>Attempting to change tsearch2 default locale to \"" .
-                                                       htmlspecialchars( $ctype ) . "\"...";
-                                               $resetlocale = 1;
-                                       }
-                               }
-                               if ( $resetlocale ) {
-                                       $SQL = "UPDATE $safetsschema.pg_ts_cfg SET locale = " . $this->addQuotes( $ctype ) . " WHERE ts_name = 'default'";
-                                       $res = $this->doQuery( $SQL );
-                                       if ( !$res ) {
-                                               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( );
-                                       }
-                                       print 'OK</li>';
-                               }
-
-                               // Final test: try out a simple tsearch2 query
-                               $SQL = "SELECT $safetsschema.to_tsvector('default','MediaWiki tsearch2 testing')";
-                               $res = $this->doQuery( $SQL );
-                               if ( !$res ) {
-                                       print '<b>FAILED</b>. Specifically, "' . htmlspecialchars( $SQL ) . '" did not work.</li>';
-                                       dieout( );
-                               }
-                               print 'OK</li>';
-                       }
-
-                       // Install plpgsql if needed
-                       $this->setup_plpgsql();
-
-                       // Does the schema already exist? Who owns it?
-                       $result = $this->schemaExists( $wgDBmwschema );
-                       if ( !$result ) {
-                               print '<li>Creating schema <b>' . htmlspecialchars( $wgDBmwschema ) . '</b> ...';
-                               error_reporting( 0 );
-                               $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
-                               $result = $this->doQuery( "CREATE SCHEMA $safeschema" );
-                               error_reporting( E_ALL );
-                               if ( !$result ) {
-                                       print '<b>FAILED</b>. The user "' . htmlspecialchars( $wgDBuser ) .
-                                               '" must be able to access the schema. '.
-                                               '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( );
-                               }
-                               print "OK</li>\n";
-                       } elseif ( $result != $wgDBuser ) {
-                               print '<li>Schema "' . htmlspecialchars( $wgDBmwschema ) . '" exists but is not owned by "' .
-                                       htmlspecialchars( $wgDBuser ) . "\". Not ideal.</li>\n";
-                       } else {
-                               print '<li>Schema "' . htmlspecialchars( $wgDBmwschema ) . '" exists and is owned by "' .
-                                       htmlspecialchars( $wgDBuser ) . "\". Excellent.</li>\n";
-                       }
-
-                       // Always return GMT time to accomodate the existing integer-based timestamp assumption
-                       print "<li>Setting the timezone to GMT for user \"" . htmlspecialchars( $wgDBuser ) . '" ...';
-                       $SQL = "ALTER USER $safeuser SET timezone = 'GMT'";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<b>FAILED</b>.</li>\n";
-                               dieout( );
-                       }
-                       print "OK</li>\n";
-                       // Set for the rest of this session
-                       $SQL = "SET timezone = 'GMT'";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<li>Failed to set timezone</li>\n";
-                               dieout( );
-                       }
-
-                       print '<li>Setting the datestyle to ISO, YMD for user "' . htmlspecialchars( $wgDBuser ) . '" ...';
-                       $SQL = "ALTER USER $safeuser SET datestyle = 'ISO, YMD'";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<b>FAILED</b>.</li>\n";
-                               dieout( );
-                       }
-                       print "OK</li>\n";
-                       // Set for the rest of this session
-                       $SQL = "SET datestyle = 'ISO, YMD'";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<li>Failed to set datestyle</li>\n";
-                               dieout( );
-                       }
-
-                       // Fix up the search paths if needed
-                       print '<li>Setting the search path for user "' . htmlspecialchars( $wgDBuser ) . '" ...';
-                       $path = $this->addIdentifierQuotes( $wgDBmwschema );
-                       if ( $wgDBts2schema !== $wgDBmwschema ) {
-                               $path .= ', '. $this->addIdentifierQuotes( $wgDBts2schema );
-                       }
-                       if ( $wgDBmwschema !== 'public' && $wgDBts2schema !== 'public' ) {
-                               $path .= ', public';
-                       }
-                       $SQL = "ALTER USER $safeuser SET search_path = $path";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<b>FAILED</b>.</li>\n";
-                               dieout( );
-                       }
-                       print "OK</li>\n";
-                       // Set for the rest of this session
-                       $SQL = "SET search_path = $path";
-                       $result = pg_query( $this->mConn, $SQL );
-                       if ( !$result ) {
-                               print "<li>Failed to set search_path</li>\n";
-                               dieout( );
-                       }
-                       define( 'POSTGRES_SEARCHPATH', $path );
-               }
-       }
-
        /**
         * Closes a database connection, if it is open
         * Returns success, true if already closed
+        * @return bool
         */
-       function close() {
-               $this->mOpened = false;
-               if ( $this->mConn ) {
-                       return pg_close( $this->mConn );
-               } else {
-                       return true;
-               }
+       protected function closeConnection() {
+               return pg_close( $this->mConn );
        }
 
-       function doQuery( $sql ) {
+       protected function doQuery( $sql ) {
                if ( function_exists( 'mb_convert_encoding' ) ) {
                        $sql = mb_convert_encoding( $sql, 'UTF-8' );
                }
@@ -559,6 +256,13 @@ class DatabasePostgres extends DatabaseBase {
                return $this->mLastResult;
        }
 
+       function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
+               $this->rollback( __METHOD__ );
+               $this->reOpen();
+               parent::reportQueryError( $error, $errno, $sql, $fname, $tempIgnore );
+       }
+
+
        function queryIgnore( $sql, $fname = 'DatabasePostgres::queryIgnore' ) {
                return $this->query( $sql, $fname, true );
        }
@@ -567,7 +271,10 @@ class DatabasePostgres extends DatabaseBase {
                if ( $res instanceof ResultWrapper ) {
                        $res = $res->result;
                }
-               if ( !@pg_free_result( $res ) ) {
+               wfSuppressWarnings();
+               $ok = pg_free_result( $res );
+               wfRestoreWarnings();
+               if ( !$ok ) {
                        throw new DBUnexpectedError( $this, "Unable to free Postgres result\n" );
                }
        }
@@ -576,11 +283,12 @@ class DatabasePostgres extends DatabaseBase {
                if ( $res instanceof ResultWrapper ) {
                        $res = $res->result;
                }
-               @$row = pg_fetch_object( $res );
-               # FIXME: HACK HACK HACK HACK debug
+               wfSuppressWarnings();
+               $row = pg_fetch_object( $res );
+               wfRestoreWarnings();
+               # @todo FIXME: HACK HACK HACK HACK debug
 
-               # TODO:
-               # hashar : not sure if the following test really trigger if the object
+               # @todo hashar: not sure if the following test really trigger if the object
                #          fetching failed.
                if( pg_last_error( $this->mConn ) ) {
                        throw new DBUnexpectedError( $this, 'SQL error: ' . htmlspecialchars( pg_last_error( $this->mConn ) ) );
@@ -592,7 +300,9 @@ class DatabasePostgres extends DatabaseBase {
                if ( $res instanceof ResultWrapper ) {
                        $res = $res->result;
                }
-               @$row = pg_fetch_array( $res );
+               wfSuppressWarnings();
+               $row = pg_fetch_array( $res );
+               wfRestoreWarnings();
                if( pg_last_error( $this->mConn ) ) {
                        throw new DBUnexpectedError( $this, 'SQL error: ' . htmlspecialchars( pg_last_error( $this->mConn ) ) );
                }
@@ -603,7 +313,9 @@ class DatabasePostgres extends DatabaseBase {
                if ( $res instanceof ResultWrapper ) {
                        $res = $res->result;
                }
-               @$n = pg_num_rows( $res );
+               wfSuppressWarnings();
+               $n = pg_num_rows( $res );
+               wfRestoreWarnings();
                if( pg_last_error( $this->mConn ) ) {
                        throw new DBUnexpectedError( $this, 'SQL error: ' . htmlspecialchars( pg_last_error( $this->mConn ) ) );
                }
@@ -626,6 +338,7 @@ class DatabasePostgres extends DatabaseBase {
 
        /**
         * This must be called after nextSequenceVal
+        * @return null
         */
        function insertId() {
                return $this->mInsertId;
@@ -666,6 +379,7 @@ class DatabasePostgres extends DatabaseBase {
         * This is not necessarily an accurate estimate, so use sparingly
         * Returns -1 if count cannot be found
         * Takes same arguments as Database::select()
+        * @return int
         */
        function estimateRowCount( $table, $vars = '*', $conds='', $fname = 'DatabasePostgres::estimateRowCount', $options = array() ) {
                $options['EXPLAIN'] = true;
@@ -684,6 +398,7 @@ class DatabasePostgres extends DatabaseBase {
        /**
         * Returns information about an index
         * If errors are explicitly ignored, returns NULL on failure
+        * @return bool|null
         */
        function indexInfo( $table, $index, $fname = 'DatabasePostgres::indexInfo' ) {
                $sql = "SELECT indexname FROM pg_indexes WHERE tablename='$table'";
@@ -756,7 +471,7 @@ class DatabasePostgres extends DatabaseBase {
                $didbegin = 0;
                if ( $ignore ) {
                        if ( !$this->mTrxLevel ) {
-                               $this->begin();
+                               $this->begin( __METHOD__ );
                                $didbegin = 1;
                        }
                        $olde = error_reporting( 0 );
@@ -830,7 +545,7 @@ class DatabasePostgres extends DatabaseBase {
                if ( $ignore ) {
                        $olde = error_reporting( $olde );
                        if ( $didbegin ) {
-                               $this->commit();
+                               $this->commit( __METHOD__ );
                        }
 
                        // Set the affected row count for the whole operation
@@ -849,7 +564,8 @@ class DatabasePostgres extends DatabaseBase {
         * Source items may be literals rather then field names, but strings should be quoted with Database::addQuotes()
         * $conds may be "*" to copy the whole table
         * srcTable may be an array of tables.
-        * @todo FIXME: implement this a little better (seperate select/insert)?
+        * @todo FIXME: Implement this a little better (seperate select/insert)?
+        * @return bool
         */
        function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'DatabasePostgres::insertSelect',
                $insertOptions = array(), $selectOptions = array() )
@@ -860,7 +576,7 @@ class DatabasePostgres extends DatabaseBase {
                $ignore = in_array( 'IGNORE', $insertOptions ) ? 'mw' : '';
 
                if( is_array( $insertOptions ) ) {
-                       $insertOptions = implode( ' ', $insertOptions );
+                       $insertOptions = implode( ' ', $insertOptions ); // FIXME: This is unused
                }
                if( !is_array( $selectOptions ) ) {
                        $selectOptions = array( $selectOptions );
@@ -876,7 +592,7 @@ class DatabasePostgres extends DatabaseBase {
                $didbegin = 0;
                if ( $ignore ) {
                        if( !$this->mTrxLevel ) {
-                               $this->begin();
+                               $this->begin( __METHOD__ );
                                $didbegin = 1;
                        }
                        $olde = error_reporting( 0 );
@@ -905,7 +621,7 @@ class DatabasePostgres extends DatabaseBase {
                        }
                        $olde = error_reporting( $olde );
                        if( $didbegin ) {
-                               $this->commit();
+                               $this->commit( __METHOD__ );
                        }
 
                        // Set the affected row count for the whole operation
@@ -918,7 +634,7 @@ class DatabasePostgres extends DatabaseBase {
                return $res;
        }
 
-       function tableName( $name ) {
+       function tableName( $name, $format = 'quoted' ) {
                # Replace reserved words with better ones
                switch( $name ) {
                        case 'user':
@@ -926,12 +642,13 @@ class DatabasePostgres extends DatabaseBase {
                        case 'text':
                                return 'pagecontent';
                        default:
-                               return $name;
+                               return parent::tableName( $name, $format );
                }
        }
 
        /**
         * Return the next in a sequence, save the value for retrieval via insertId()
+        * @return null
         */
        function nextSequenceValue( $seqName ) {
                $safeseq = str_replace( "'", "''", $seqName );
@@ -943,6 +660,7 @@ class DatabasePostgres extends DatabaseBase {
 
        /**
         * Return the current value of a sequence. Assumes it has been nextval'ed in this session.
+        * @return
         */
        function currentSequenceValue( $seqName ) {
                $safeseq = str_replace( "'", "''", $seqName );
@@ -952,83 +670,6 @@ class DatabasePostgres extends DatabaseBase {
                return $currval;
        }
 
-       /**
-        * REPLACE query wrapper
-        * Postgres simulates this with a DELETE followed by INSERT
-        * $row is the row to insert, an associative array
-        * $uniqueIndexes is an array of indexes. Each element may be either a
-        * field name or an array of field names
-        *
-        * It may be more efficient to leave off unique indexes which are unlikely to collide.
-        * However if you do this, you run the risk of encountering errors which wouldn't have
-        * occurred in MySQL
-        */
-       function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabasePostgres::replace' ) {
-               $table = $this->tableName( $table );
-
-               if ( count( $rows ) == 0 ) {
-                       return;
-               }
-
-               # Single row case
-               if ( !is_array( reset( $rows ) ) ) {
-                       $rows = array( $rows );
-               }
-
-               foreach( $rows as $row ) {
-                       # Delete rows which collide
-                       if ( $uniqueIndexes ) {
-                               $sql = "DELETE FROM $table WHERE ";
-                               $first = true;
-                               foreach ( $uniqueIndexes as $index ) {
-                                       if ( $first ) {
-                                               $first = false;
-                                               $sql .= '(';
-                                       } else {
-                                               $sql .= ') OR (';
-                                       }
-                                       if ( is_array( $index ) ) {
-                                               $first2 = true;
-                                               foreach ( $index as $col ) {
-                                                       if ( $first2 ) {
-                                                               $first2 = false;
-                                                       } else {
-                                                               $sql .= ' AND ';
-                                                       }
-                                                       $sql .= $col.'=' . $this->addQuotes( $row[$col] );
-                                               }
-                                       } else {
-                                               $sql .= $index.'=' . $this->addQuotes( $row[$index] );
-                                       }
-                               }
-                               $sql .= ')';
-                               $this->query( $sql, $fname );
-                       }
-
-                       # Now insert the row
-                       $sql = "INSERT INTO $table (" . $this->makeList( array_keys( $row ), LIST_NAMES ) .') VALUES (' .
-                               $this->makeList( $row, LIST_COMMA ) . ')';
-                       $this->query( $sql, $fname );
-               }
-       }
-
-       # DELETE where the condition is a join
-       function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'DatabasePostgres::deleteJoin' ) {
-               if ( !$conds ) {
-                       throw new DBUnexpectedError( $this, 'DatabasePostgres::deleteJoin() called with empty $conds' );
-               }
-
-               $delTable = $this->tableName( $delTable );
-               $joinTable = $this->tableName( $joinTable );
-               $sql = "DELETE FROM $delTable WHERE $delVar IN (SELECT $joinVar FROM $joinTable ";
-               if ( $conds != '*' ) {
-                       $sql .= 'WHERE ' . $this->makeList( $conds, LIST_AND );
-               }
-               $sql .= ')';
-
-               $this->query( $sql, $fname );
-       }
-
        # Returns the size of a text field, or -1 for "unlimited"
        function textFieldSize( $table, $field ) {
                $table = $this->tableName( $table );
@@ -1055,9 +696,29 @@ class DatabasePostgres extends DatabaseBase {
        }
 
        function duplicateTableStructure( $oldName, $newName, $temporary = false, $fname = 'DatabasePostgres::duplicateTableStructure' ) {
+               $newName = $this->addIdentifierQuotes( $newName );
+               $oldName = $this->addIdentifierQuotes( $oldName );
                return $this->query( 'CREATE ' . ( $temporary ? 'TEMPORARY ' : '' ) . " TABLE $newName (LIKE $oldName INCLUDING DEFAULTS)", $fname );
        }
 
+       function listTables( $prefix = null, $fname = 'DatabasePostgres::listTables' ) {
+               global $wgDBmwschema;
+               $eschema = $this->addQuotes( $wgDBmwschema );
+               $result = $this->query( "SELECT tablename FROM pg_tables WHERE schemaname = $eschema", $fname );
+
+               $endArray = array();
+
+               foreach( $result as $table ) {
+                       $vars = get_object_vars($table);
+                       $table = array_pop( $vars );
+                       if( !$prefix || strpos( $table, $prefix ) === 0 ) {
+                               $endArray[] = $table;
+                       }
+               }
+
+               return $endArray;
+       }
+
        function timestamp( $ts = 0 ) {
                return wfTimestamp( TS_POSTGRES, $ts );
        }
@@ -1069,23 +730,6 @@ class DatabasePostgres extends DatabaseBase {
                return $valuedata;
        }
 
-       function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
-               // Ignore errors during error handling to avoid infinite recursion
-               $ignore = $this->ignoreErrors( true );
-               $this->mErrorCount++;
-
-               if ( $ignore || $tempIgnore ) {
-                       wfDebug( "SQL ERROR (ignored): $error\n" );
-                       $this->ignoreErrors( $ignore );
-               } else {
-                       $message = "A database error has occurred.  Did you forget to run maintenance/update.php after upgrading?  See: http://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" .
-                               "Query: $sql\n" .
-                               "Function: $fname\n" .
-                               "Error: $errno $error\n";
-                       throw new DBUnexpectedError( $this, $message );
-               }
-       }
-
        /**
         * @return string wikitext of a link to the server software's web site
         */
@@ -1116,6 +760,7 @@ class DatabasePostgres extends DatabaseBase {
        /**
         * Query whether a given relation exists (in the given schema, or the
         * default mw one if not given)
+        * @return bool
         */
        function relationExists( $table, $types, $schema = false ) {
                global $wgDBmwschema;
@@ -1125,6 +770,7 @@ class DatabasePostgres extends DatabaseBase {
                if ( !$schema ) {
                        $schema = $wgDBmwschema;
                }
+               $table = $this->tableName( $table, 'raw' );
                $etable = $this->addQuotes( $table );
                $eschema = $this->addQuotes( $schema );
                $SQL = "SELECT 1 FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "
@@ -1138,8 +784,9 @@ class DatabasePostgres extends DatabaseBase {
        /**
         * For backward compatibility, this function checks both tables and
         * views.
+        * @return bool
         */
-       function tableExists( $table, $schema = false ) {
+       function tableExists( $table, $fname = __METHOD__, $schema = false ) {
                return $this->relationExists( $table, array( 'r', 'v' ), $schema );
        }
 
@@ -1153,8 +800,8 @@ class DatabasePostgres extends DatabaseBase {
                $q = <<<SQL
        SELECT 1 FROM pg_class, pg_namespace, pg_trigger
                WHERE relnamespace=pg_namespace.oid AND relkind='r'
-                     AND tgrelid=pg_class.oid
-                     AND nspname=%s AND relname=%s AND tgname=%s
+                         AND tgrelid=pg_class.oid
+                         AND nspname=%s AND relname=%s AND tgname=%s
 SQL;
                $res = $this->query(
                        sprintf(
@@ -1200,20 +847,23 @@ SQL;
        }
 
        /**
-        * Query whether a given schema exists. Returns the name of the owner
+        * Query whether a given schema exists. Returns true if it does, false if it doesn't.
+        * @return bool
         */
        function schemaExists( $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 );
-               if ( $res && $res->numRows() ) {
-                       $row = $res->fetchObject();
-                       $owner = $row->rolname;
-               } else {
-                       $owner = false;
-               }
-               return $owner;
+               $exists = $this->selectField( '"pg_catalog"."pg_namespace"', 1,
+                       array( 'nspname' => $schema ), __METHOD__ );
+               return (bool)$exists;
+       }
+
+       /**
+        * Returns true if a given role (i.e. user) exists, false otherwise.
+        * @return bool
+        */
+       function roleExists( $roleName ) {
+               $exists = $this->selectField( '"pg_catalog"."pg_roles"', 1,
+                       array( 'rolname' => $roleName ), __METHOD__ );
+               return (bool)$exists;
        }
 
        function fieldInfo( $table, $field ) {
@@ -1222,6 +872,7 @@ SQL;
 
        /**
         * pg_field_type() wrapper
+        * @return string
         */
        function fieldType( $res, $index ) {
                if ( $res instanceof ResultWrapper ) {
@@ -1235,6 +886,10 @@ SQL;
                return $sql;
        }
 
+       /**
+        * @param $b
+        * @return Blob
+        */
        function encodeBlob( $b ) {
                return new Blob( pg_escape_bytea( $this->mConn, $b ) );
        }
@@ -1250,6 +905,10 @@ SQL;
                return pg_escape_string( $this->mConn, $s );
        }
 
+       /**
+        * @param $s null|bool|Blob
+        * @return int|string
+        */
        function addQuotes( $s ) {
                if ( is_null( $s ) ) {
                        return 'NULL';
@@ -1307,13 +966,21 @@ SQL;
                }
 
                if ( isset( $options['GROUP BY'] ) ) {
-                       $preLimitTail .= ' GROUP BY ' . $options['GROUP BY'];
+                       $gb = is_array( $options['GROUP BY'] )
+                               ? implode( ',', $options['GROUP BY'] )
+                               : $options['GROUP BY'];
+                       $preLimitTail .= " GROUP BY {$gb}";
                }
+
                if ( isset( $options['HAVING'] ) ) {
                        $preLimitTail .= " HAVING {$options['HAVING']}";
                }
+
                if ( isset( $options['ORDER BY'] ) ) {
-                       $preLimitTail .= ' ORDER BY ' . $options['ORDER BY'];
+                       $ob = is_array( $options['ORDER BY'] )
+                               ? implode( ',', $options['ORDER BY'] )
+                               : $options['ORDER BY'];
+                       $preLimitTail .= " ORDER BY {$ob}";
                }
 
                //if ( isset( $options['LIMIT'] ) ) {
@@ -1352,4 +1019,17 @@ SQL;
        public function getSearchEngine() {
                return 'SearchPostgres';
        }
+
+       public function streamStatementEnd( &$sql, &$newLine ) {
+               # Allow dollar quoting for function declarations
+               if ( substr( $newLine, 0, 4 ) == '$mw$' ) {
+                       if ( $this->delimiter ) {
+                               $this->delimiter = false;
+                       }
+                       else {
+                               $this->delimiter = ';';
+                       }
+               }
+               return parent::streamStatementEnd( $sql, $newLine );
+       }
 } // end DatabasePostgres class