All the databases but MySQL were overriding DatabaseBase::deleteJoin() with the same...
[lhc/web/wiklou.git] / includes / db / DatabasePostgres.php
index 672e022..3b54cce 100644 (file)
@@ -6,11 +6,17 @@
  * @ingroup Database
  */
 
-class PostgresField {
+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, false );
                $res = $db->query(
                        sprintf( $q,
                                $db->addQuotes( $wgDBmwschema ),
@@ -69,7 +75,7 @@ SQL;
                return $this->type;
        }
 
-       function nullable() {
+       function isNullable() {
                return $this->nullable;
        }
 
@@ -100,14 +106,6 @@ class DatabasePostgres extends DatabaseBase {
        var $numeric_version = null;
        var $mAffectedRows = null;
 
-       function __construct( $server = false, $user = false, $password = false, $dbName = false,
-               $failFunction = false, $flags = 0 )
-       {
-               $this->mFailFunction = $failFunction;
-               $this->mFlags = $flags;
-               $this->open( $server, $user, $password, $dbName );
-       }
-
        function getType() {
                return 'postgres';
        }
@@ -139,18 +137,14 @@ class DatabasePostgres extends DatabaseBase {
 
        function hasConstraint( $name ) {
                global $wgDBmwschema;
-               $SQL = "SELECT 1 FROM pg_catalog.pg_constraint c, pg_catalog.pg_namespace n WHERE c.connamespace = n.oid AND conname = '" . pg_escape_string( $this->mConn, $name ) . "' AND n.nspname = '" . pg_escape_string( $this->mConn, $wgDBmwschema ) ."'";
-               return $this->numRows( $res = $this->doQuery( $SQL ) );
-       }
-
-       static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 )
-       {
-               return new DatabasePostgres( $server, $user, $password, $dbName, $failFunction, $flags );
+               $SQL = "SELECT 1 FROM pg_catalog.pg_constraint c, pg_catalog.pg_namespace n WHERE c.connamespace = n.oid AND conname = '" .
+                               pg_escape_string( $this->mConn, $name ) . "' AND n.nspname = '" . pg_escape_string( $this->mConn, $wgDBmwschema ) ."'";
+               $res = $this->doQuery( $SQL );
+               return $this->numRows( $res );
        }
 
        /**
         * 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
@@ -163,9 +157,10 @@ 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;
@@ -191,11 +186,7 @@ class DatabasePostgres extends DatabaseBase {
                        wfDebug( "DB connection error\n" );
                        wfDebug( "Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n" );
                        wfDebug( $this->lastError() . "\n" );
-                       if ( !$this->mFailFunction ) {
-                               throw new DBConnectionError( $this, $phpError );
-                       } else {
-                               return false;
-                       }
+                       throw new DBConnectionError( $this, str_replace( "\n", ' ', $phpError ) );
                }
 
                $this->mOpened = true;
@@ -206,22 +197,34 @@ 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__ );
 
-               global $wgDBmwschema, $wgDBts2schema;
-               if ( isset( $wgDBmwschema ) && isset( $wgDBts2schema )
-                       && $wgDBmwschema !== 'mediawiki'
-                       && preg_match( '/^\w+$/', $wgDBmwschema )
-                       && preg_match( '/^\w+$/', $wgDBts2schema )
-               ) {
-                       $safeschema = $this->quote_ident( $wgDBmwschema );
-                       $safeschema2 = $this->quote_ident( $wgDBts2schema );
-                       $this->doQuery( "SET search_path = $safeschema, $wgDBts2schema, public" );
+               global $wgDBmwschema;
+               if ( $this->schemaExists( $wgDBmwschema ) ) {
+                       $safeschema = $this->addIdentifierQuotes( $wgDBmwschema );
+                       $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 ) {
@@ -230,359 +233,6 @@ 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;
-
-               print '<li>Checking the version of Postgres...';
-               $version = $this->getServerVersion();
-               $PGMINVER = '8.1';
-               if ( $version < $PGMINVER ) {
-                       print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n";
-                       dieout( '</ul>' );
-               }
-               print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\n";
-
-               $safeuser = $this->quote_ident( $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( '</ul>' );
-                       }
-                       $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( '</ul>' );
-                               }
-                               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( '</ul>' );
-                                       }
-                                       print '<li>Creating database <b>' . htmlspecialchars( $wgDBname ) . '</b>...';
-                                       $safename = $this->quote_ident( $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( '</ul>' );
-                               }
-                               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( '</ul>' );
-                               }
-                               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->quote_ident( $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>' );
-                               }
-                               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( '</ul>' );
-                               }
-                               $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();
-
-                       $superuser = '';
-                       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( '</ul>' );
-                               }
-                               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->quote_ident( $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( '</ul>' );
-                                       }
-                               }
-                               $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( '</ul>' );
-                                       }
-                                       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( '</ul>' );
-                               }
-                               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->quote_ident( $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( '</ul>' );
-                               }
-                               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( '</ul>' );
-                       }
-                       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( '</ul>' );
-                       }
-
-                       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( '</ul>' );
-                       }
-                       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( '</ul>' );
-                       }
-
-                       // Fix up the search paths if needed
-                       print '<li>Setting the search path for user "' . htmlspecialchars( $wgDBuser ) . '" ...';
-                       $path = $this->quote_ident( $wgDBmwschema );
-                       if ( $wgDBts2schema !== $wgDBmwschema ) {
-                               $path .= ', '. $this->quote_ident( $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( '</ul>' );
-                       }
-                       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( '</ul>' );
-                       }
-                       define( 'POSTGRES_SEARCHPATH', $path );
-               }
-       }
-
-       function setup_plpgsql() {
-               print '<li>Checking for PL/pgSQL ...';
-               $SQL = "SELECT 1 FROM pg_catalog.pg_language WHERE lanname = 'plpgsql'";
-               $rows = $this->numRows( $this->doQuery( $SQL ) );
-               if ( $rows < 1 ) {
-                       // plpgsql is not installed, but if we have a pg_pltemplate table, we should be able to create it
-                       print 'not installed. Attempting to install PL/pgSQL ...';
-                       $SQL = "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace) ".
-                               "WHERE relname = 'pg_pltemplate' AND nspname='pg_catalog'";
-                       $rows = $this->numRows( $this->doQuery( $SQL ) );
-                       global $wgDBname;
-                       if ( $rows >= 1 ) {
-                               $olde = error_reporting( 0 );
-                               error_reporting( $olde - E_WARNING );
-                               $result = $this->doQuery( 'CREATE LANGUAGE plpgsql' );
-                               error_reporting( $olde );
-                               if ( !$result ) {
-                                       print '<b>FAILED</b>. You need to install the language PL/pgSQL in the database <tt>' .
-                                               htmlspecialchars( $wgDBname ) . '</tt></li>';
-                                       dieout( '</ul>' );
-                               }
-                       } else {
-                               print '<b>FAILED</b>. You need to install the language PL/pgSQL in the database <tt>' .
-                                       htmlspecialchars( $wgDBname ) . '</tt></li>';
-                               dieout( '</ul>' );
-                       }
-               }
-               print "OK</li>\n";
-       }
-
        /**
         * Closes a database connection, if it is open
         * Returns success, true if already closed
@@ -605,7 +255,7 @@ class DatabasePostgres extends DatabaseBase {
                return $this->mLastResult;
        }
 
-       function queryIgnore( $sql, $fname = '' ) {
+       function queryIgnore( $sql, $fname = 'DatabasePostgres::queryIgnore' ) {
                return $this->query( $sql, $fname, true );
        }
 
@@ -623,10 +273,9 @@ class DatabasePostgres extends DatabaseBase {
                        $res = $res->result;
                }
                @$row = pg_fetch_object( $res );
-               # FIXME: HACK HACK HACK HACK debug
+               # @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 ) ) );
@@ -737,7 +386,7 @@ class DatabasePostgres extends DatabaseBase {
                if ( !$res ) {
                        return null;
                }
-               while ( $row = $this->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        if ( $row->indexname == $this->indexName( $index ) ) {
                                return $row;
                        }
@@ -754,11 +403,10 @@ class DatabasePostgres extends DatabaseBase {
                if ( !$res ) {
                        return null;
                }
-               while ( $row = $this->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        return true;
                }
                return false;
-
        }
 
        /**
@@ -896,7 +544,7 @@ 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)?
         */
        function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'DatabasePostgres::insertSelect',
                $insertOptions = array(), $selectOptions = array() )
@@ -965,7 +613,7 @@ class DatabasePostgres extends DatabaseBase {
                return $res;
        }
 
-       function tableName( $name ) {
+       function tableName( $name, $quoted = true ) {
                # Replace reserved words with better ones
                switch( $name ) {
                        case 'user':
@@ -973,7 +621,7 @@ class DatabasePostgres extends DatabaseBase {
                        case 'text':
                                return 'pagecontent';
                        default:
-                               return $name;
+                               return parent::tableName( $name, $quoted );
                }
        }
 
@@ -981,7 +629,7 @@ class DatabasePostgres extends DatabaseBase {
         * 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];
@@ -992,7 +640,7 @@ class DatabasePostgres extends DatabaseBase {
         * 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];
@@ -1059,23 +707,6 @@ class DatabasePostgres extends DatabaseBase {
                }
        }
 
-       # 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 );
@@ -1102,6 +733,8 @@ 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 );
        }
 
@@ -1116,23 +749,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
         */
@@ -1172,6 +788,7 @@ class DatabasePostgres extends DatabaseBase {
                if ( !$schema ) {
                        $schema = $wgDBmwschema;
                }
+               $table = $this->tableName( $table, false );
                $etable = $this->addQuotes( $table );
                $eschema = $this->addQuotes( $schema );
                $SQL = "SELECT 1 FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "
@@ -1247,20 +864,21 @@ 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.
         */
        function schemaExists( $schema ) {
-               $eschema = preg_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.
+        */
+       function roleExists( $roleName ) {
+               $exists = $this->selectField( '"pg_catalog"."pg_roles"', 1,
+                       array( 'rolname' => $roleName ), __METHOD__ );
+               return (bool)$exists;
        }
 
        function fieldInfo( $table, $field ) {
@@ -1282,57 +900,10 @@ 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' );
-       }
-
+       /**
+        * @param $b
+        * @return Blob
+        */
        function encodeBlob( $b ) {
                return new Blob( pg_escape_bytea( $this->mConn, $b ) );
        }
@@ -1348,6 +919,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';
@@ -1359,10 +934,6 @@ SQL;
                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
@@ -1409,13 +980,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'] ) ) {