Revert r35848 per Brion's WONTFIX of bug 14536: "This would just mean that there...
[lhc/web/wiklou.git] / includes / DatabasePostgres.php
index 085d9bc..8f8488b 100644 (file)
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @ingroup Database
+ * @file
+ */
 
 /**
  * This is the Postgres database abstraction layer.
@@ -7,7 +11,7 @@
  * than MySQL ones, some of them should be moved to parent
  * Database class.
  *
- * @addtogroup Database
+ * @ingroup Database
  */
 class PostgresField {
        private $name, $tablename, $type, $nullable, $max_length;
@@ -16,7 +20,7 @@ class PostgresField {
        global $wgDBmwschema;
 
                $q = <<<END
-SELECT 
+SELECT
 CASE WHEN typname = 'int2' THEN 'smallint'
 WHEN typname = 'int4' THEN 'integer'
 WHEN typname = 'int8' THEN 'bigint'
@@ -70,7 +74,7 @@ END;
 }
 
 /**
- * @addtogroup Database
+ * @ingroup Database
  */
 class DatabasePostgres extends Database {
        var $mInsertId = NULL;
@@ -119,7 +123,8 @@ class DatabasePostgres extends Database {
        }
 
        function hasConstraint( $name ) {
-               $SQL = "SELECT 1 FROM pg_catalog.pg_constraint WHERE conname = '" . pg_escape_string( $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( $name ) . "' AND n.nspname = '" . pg_escape_string($wgDBmwschema) ."'";
                return $this->numRows($res = $this->doQuery($SQL));
        }
 
@@ -146,7 +151,7 @@ class DatabasePostgres extends Database {
 
                $this->close();
                $this->mServer = $server;
-               $port = $wgDBport;
+               $this->mPort = $port = $wgDBport;
                $this->mUser = $user;
                $this->mPassword = $password;
                $this->mDBname = $dbName;
@@ -159,7 +164,6 @@ class DatabasePostgres extends Database {
                        $hstring .= "port=$port ";
                }
 
-
                error_reporting( E_ALL );
                @$this->mConn = pg_connect("$hstring dbname=$dbName user=$user password=$password");
 
@@ -171,94 +175,124 @@ class DatabasePostgres extends Database {
                }
 
                $this->mOpened = true;
-               ## If this is the initial connection, setup the schema stuff and possibly create the user
-               ## TODO: Move this out of open()
-               if (defined('MEDIAWIKI_INSTALL')) {
-                       global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBsuperuser, $wgDBmwschema,
-                               $wgDBts2schema;
-
-                       print "<li>Checking the version of Postgres...";
-                       $version = $this->getServerVersion();
-                       $PGMINVER = "8.1";
-                       if ($this->numeric_version < $PGMINVER) {
-                               print "<b>FAILED</b>. Required version is $PGMINVER. You have $this->numeric_version ($version)</li>\n";
-                               dieout("</ul>");
+
+               global $wgCommandLineMode;
+               ## If called from the command-line (e.g. importDump), only show errors
+               if ($wgCommandLineMode) {
+                       $this->doQuery("SET client_min_messages = 'ERROR'");
+               }
+
+               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");
+               }
+
+               return $this->mConn;
+       }
+
+
+       function initial_setup($password, $dbName) {
+               // If this is the initial connection, setup the schema stuff and possibly create the user
+               global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBsuperuser, $wgDBmwschema, $wgDBts2schema;
+
+               print "<li>Checking the version of Postgres...";
+               $version = $this->getServerVersion();
+               $PGMINVER = '8.1';
+               if ($this->numeric_version < $PGMINVER) {
+                       print "<b>FAILED</b>. Required version is $PGMINVER. You have $this->numeric_version ($version)</li>\n";
+                       dieout("</ul>");
+               }
+               print "version $this->numeric_version is OK.</li>\n";
+
+               $safeuser = $this->quote_ident($wgDBuser);
+               // Are we connecting as a superuser for the first time?
+               if ($wgDBsuperuser) {
+                       // 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($wgDBsuperuser);
+                       $rows = $this->numRows($res = $this->doQuery($SQL));
+                       if (!$rows) {
+                               print "<li>ERROR: Could not read permissions for user \"$wgDBsuperuser\"</li>\n";
+                               dieout('</ul>');
                        }
-                       print "version $this->numeric_version is OK.</li>\n";
-
-                       $safeuser = $this->quote_ident($wgDBuser);
-                       ## Are we connecting as a superuser for the first time?
-                       if ($wgDBsuperuser) {
-                               ## 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($wgDBsuperuser);
-                               $rows = $this->numRows($res = $this->doQuery($SQL));
-                               if (!$rows) {
-                                       print "<li>ERROR: Could not read permissions for user \"$wgDBsuperuser\"</li>\n";
+                       $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 \"$wgDBuser\" already exists, skipping account creation.</li>";
+                       }
+                       else {
+                               if ($perms != 1 and $perms != 3) {
+                                       print "<li>ERROR: the user \"$wgDBsuperuser\" cannot create other users. ";
+                                       print 'Please use a different Postgres user.</li>';
                                        dieout('</ul>');
                                }
-                               $perms = pg_fetch_result($res, 0, 0);
-
-                               $SQL = "SELECT 1 FROM pg_catalog.pg_user WHERE usename = " . $this->addQuotes($wgDBuser);
+                               print "<li>Creating user <b>$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>User \"$wgDBuser\" already exists, skipping account creation.</li>";
+                                       print "<li>Database \"$wgDBname\" already exists, skipping database creation.</li>";
                                }
                                else {
-                                       if ($perms != 1 and $perms != 3) {
-                                               print "<li>ERROR: the user \"$wgDBsuperuser\" cannot create other users. ";
+                                       if ($perms < 2) {
+                                               print "<li>ERROR: the user \"$wgDBsuperuser\" cannot create databases. ";
                                                print 'Please use a different Postgres user.</li>';
                                                dieout('</ul>');
                                        }
-                                       print "<li>Creating user <b>$wgDBuser</b>...";
-                                       $safepass = $this->addQuotes($wgDBpassword);
-                                       $SQL = "CREATE USER $safeuser NOCREATEDB PASSWORD $safepass";
+                                       print "<li>Creating database <b>$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...
                                }
-                               ## 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 \"$wgDBname\" already exists, skipping database creation.</li>";
-                                       }
-                                       else {
-                                               if ($perms < 2) {
-                                                       print "<li>ERROR: the user \"$wgDBsuperuser\" cannot create databases. ";
-                                                       print 'Please use a different Postgres user.</li>';
-                                                       dieout('</ul>');
-                                               }
-                                               print "<li>Creating database <b>$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 \"$wgDBname\" as superuser \"$wgDBsuperuser\" to check rights...";
-                                       @$this->mConn = pg_connect("$hstring dbname=$wgDBname user=$user password=$password");
-                                       if ( $this->mConn == false ) {
-                                               print "<b>FAILED TO CONNECT!</b></li>";
-                                               dieout("</ul>");
-                                       }
-                                       print "OK</li>\n";
+                               // Reconnect to check out tsearch2 rights for this user
+                               print "<li>Connecting to \"$wgDBname\" as superuser \"$wgDBsuperuser\" to check rights...";
+
+                               $hstring="";
+                               if ($this->mServer!=false && $this->mServer!="") {
+                                       $hstring="host=$this->mServer ";
+                               }
+                               if ($this->mPort!=false && $this->mPort!="") {
+                                       $hstring .= "port=$this->mPort ";
+                               }
+
+                               @$this->mConn = pg_connect("$hstring dbname=$wgDBname user=$wgDBsuperuser password=$password");
+                               if ( $this->mConn == false ) {
+                                       print "<b>FAILED TO CONNECT!</b></li>";
+                                       dieout("</ul>");
                                }
+                               print "OK</li>\n";
+                       }
 
-                               ## Tsearch2 checks
+                       if ($this->numeric_version < 8.3) {
+                               // Tsearch2 checks
                                print "<li>Checking that tsearch2 is installed in the database \"$wgDBname\"...";
                                if (! $this->tableExists("pg_ts_cfg", $wgDBts2schema)) {
                                        print "<b>FAILED</b>. tsearch2 must be installed in the database \"$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 \"$wgDBuser\" has select rights on the tsearch2 tables...";
                                foreach (array('cfg','cfgmap','dict','parser') as $table) {
@@ -266,176 +300,159 @@ class DatabasePostgres extends Database {
                                        $this->doQuery($SQL);
                                }
                                print "OK</li>\n";
+                       }
 
-
-                               ## Setup the schema for this user if needed
-                               $result = $this->schemaExists($wgDBmwschema);
-                               $safeschema = $this->quote_ident($wgDBmwschema);
+                       // Setup the schema for this user if needed
+                       $result = $this->schemaExists($wgDBmwschema);
+                       $safeschema = $this->quote_ident($wgDBmwschema);
+                       if (!$result) {
+                               print "<li>Creating schema <b>$wgDBmwschema</b> ...";
+                               $result = $this->doQuery("CREATE SCHEMA $safeschema AUTHORIZATION $safeuser");
                                if (!$result) {
-                                       print "<li>Creating schema <b>$wgDBmwschema</b> ...";
-                                       $result = $this->doQuery("CREATE SCHEMA $safeschema AUTHORIZATION $safeuser");
-                                       if (!$result) {
-                                               print "<b>FAILED</b>.</li>\n";
-                                               dieout("</ul>");
-                                       }
-                                       print "OK</li>\n";
+                                       print "<b>FAILED</b>.</li>\n";
+                                       dieout("</ul>");
                                }
-                               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>";
+                               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>";
+                       }
 
-                               $wgDBsuperuser = '';
-                               return true; ## Reconnect as regular user
+                       // Install plpgsql if needed
+                       $this->setup_plpgsql();
 
-                       } ## end superuser
+                       $wgDBsuperuser = '';
+                       return true; // Reconnect as regular user
 
-               if (!defined('POSTGRES_SEARCHPATH')) {
+               } // end superuser
 
-                       ## Do we have the basic tsearch2 table?
-                       print "<li>Checking for tsearch2 in the schema \"$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";
+               if (!defined('POSTGRES_SEARCHPATH')) {
 
-                       ## 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');
-                       foreach ( $ts2tables AS $tname ) {
-                               $SQL = "SELECT count(*) FROM $wgDBts2schema.pg_ts_$tname";
-                               $res = $this->doQuery($SQL);
-                               if (!$res) {
-                                       print "<b>FAILED</b> to access pg_ts_$tname. Make sure that the user ".
-                                       "\"$wgDBuser\" has SELECT access to all four tsearch2 tables</li>\n";
+                       if ($this->numeric_version < 8.3) {
+                               // Do we have the basic tsearch2 table?
+                               print "<li>Checking for tsearch2 in the schema \"$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>");
                                }
-                       }
-                       $SQL = "SELECT ts_name FROM $wgDBts2schema.pg_ts_cfg WHERE locale = '$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>";
+                               print "OK</li>\n";
 
-                       ## Will the current locale work? Can we force it to?
-                       print "<li>Verifying tsearch2 locale with $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 \"$ctype\"...";
-                               $resetlocale = 1;
-                       }
-                       else {
-                               $tsname = pg_fetch_result($res, 0, 0);
-                               if ($tsname != 'default') {
-                                       print "<b>not set to default ($tsname)</b>";
-                                       print "<li>Attempting to change tsearch2 default locale to \"$ctype\"...";
-                                       $resetlocale = 1;
+                               // 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 pg_ts_$tname. Make sure that the user ".
+                                                       "\"$wgDBuser\" has SELECT access to all four tsearch2 tables</li>\n";
+                                               dieout("</ul>");
+                                       }
                                }
-                       }
-                       if ($resetlocale) {
-                               $SQL = "UPDATE $wgDBts2schema.pg_ts_cfg SET locale = '$ctype' WHERE ts_name = 'default'";
+                               $SQL = "SELECT ts_name FROM $safetsschema.pg_ts_cfg WHERE locale = '$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>. ";
-                                       print "Please make sure that the locale in pg_ts_cfg for \"default\" is set to \"$ctype\"</li>\n";
+                                       print "<b>FAILED</b>. Could not determine the tsearch2 locale information</li>\n";
                                        dieout("</ul>");
                                }
                                print "OK</li>";
-                       }
-
-                       ## Final test: try out a simple tsearch2 query
-                       $SQL = "SELECT $wgDBts2schema.to_tsvector('default','MediaWiki tsearch2 testing')";
-                       $res = $this->doQuery($SQL);
-                       if (!$res) {
-                               print "<b>FAILED</b>. Specifically, \"$SQL\" did not work.</li>";
-                               dieout("</ul>");
-                       }
-                       print "OK</li>";
 
-                       ## Do we have plpgsql installed?
-                       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));
-                               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 plpgsql in the database <tt>$wgDBname</tt></li>";
+                               // Will the current locale work? Can we force it to?
+                               print "<li>Verifying tsearch2 locale with $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 \"$ctype\"...";
+                                       $resetlocale = 1;
+                               }
+                               else {
+                                       $tsname = pg_fetch_result($res, 0, 0);
+                                       if ($tsname != 'default') {
+                                               print "<b>not set to default ($tsname)</b>";
+                                               print "<li>Attempting to change tsearch2 default locale to \"$ctype\"...";
+                                               $resetlocale = 1;
+                                       }
+                               }
+                               if ($resetlocale) {
+                                       $SQL = "UPDATE $safetsschema.pg_ts_cfg SET locale = '$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 \"$ctype\"</li>\n";
                                                dieout("</ul>");
                                        }
+                                       print "OK</li>";
                                }
-                               else {
-                                       print "<b>FAILED</b>. You need to install the language plpgsql in the database <tt>$wgDBname</tt></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, \"$SQL\" did not work.</li>";
                                        dieout("</ul>");
                                }
+                               print "OK</li>";
                        }
-                       print "OK</li>\n";
 
-                       ## Does the schema already exist? Who owns it?
+                       // 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>$wgDBmwschema</b> ...";
                                error_reporting( 0 );
-                               $result = $this->doQuery("CREATE SCHEMA $wgDBmwschema");
+                               $safeschema = $this->quote_ident($wgDBmwschema);
+                               $result = $this->doQuery("CREATE SCHEMA $safeschema");
                                error_reporting( E_ALL );
                                if (!$result) {
                                        print "<b>FAILED</b>. The user \"$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 \"$wgDBuser\" user.</li>\n";
+                                               "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 \"$wgDBuser\" user.</li>\n";
                                        dieout("</ul>");
                                }
                                print "OK</li>\n";
                        }
-                       else if ($result != $user) {
-                               print "<li>Schema \"$wgDBmwschema\" exists but is not owned by \"$user\". Not ideal.</li>\n";
+                       else if ($result != $wgDBuser) {
+                               print "<li>Schema \"$wgDBmwschema\" exists but is not owned by \"$wgDBuser\". Not ideal.</li>\n";
                        }
                        else {
-                               print "<li>Schema \"$wgDBmwschema\" exists and is owned by \"$user\". Excellent.</li>\n";
+                               print "<li>Schema \"$wgDBmwschema\" exists and is owned by \"$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 \"$user\" ...";
+                       // Always return GMT time to accomodate the existing integer-based timestamp assumption
+                       print "<li>Setting the timezone to GMT for user \"$wgDBuser\" ...";
                        $SQL = "ALTER USER $safeuser SET timezone = 'GMT'";
                        $result = pg_query($this->mConn, $SQL);
                        if (!$result) {
@@ -443,7 +460,7 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
                        print "OK</li>\n";
-                       ## Set for the rest of this session
+                       // Set for the rest of this session
                        $SQL = "SET timezone = 'GMT'";
                        $result = pg_query($this->mConn, $SQL);
                        if (!$result) {
@@ -451,7 +468,7 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
 
-                       print "<li>Setting the datestyle to ISO, YMD for user \"$user\" ...";
+                       print "<li>Setting the datestyle to ISO, YMD for user \"$wgDBuser\" ...";
                        $SQL = "ALTER USER $safeuser SET datestyle = 'ISO, YMD'";
                        $result = pg_query($this->mConn, $SQL);
                        if (!$result) {
@@ -459,7 +476,7 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
                        print "OK</li>\n";
-                       ## Set for the rest of this session
+                       // Set for the rest of this session
                        $SQL = "SET datestyle = 'ISO, YMD'";
                        $result = pg_query($this->mConn, $SQL);
                        if (!$result) {
@@ -467,8 +484,8 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
 
-                       ## Fix up the search paths if needed
-                       print "<li>Setting the search path for user \"$user\" ...";
+                       // Fix up the search paths if needed
+                       print "<li>Setting the search path for user \"$wgDBuser\" ...";
                        $path = $this->quote_ident($wgDBmwschema);
                        if ($wgDBts2schema !== $wgDBmwschema)
                                $path .= ", ". $this->quote_ident($wgDBts2schema);
@@ -481,7 +498,7 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
                        print "OK</li>\n";
-                       ## Set for the rest of this session
+                       // Set for the rest of this session
                        $SQL = "SET search_path = $path";
                        $result = pg_query($this->mConn, $SQL);
                        if (!$result) {
@@ -489,26 +506,39 @@ class DatabasePostgres extends Database {
                                dieout("</ul>");
                        }
                        define( "POSTGRES_SEARCHPATH", $path );
-               }}
-
-               global $wgCommandLineMode;
-               ## If called from the command-line (e.g. importDump), only show errors
-               if ($wgCommandLineMode) {
-                       $this->doQuery("SET client_min_messages = 'ERROR'");
                }
+       }
 
-               global $wgDBmwschema, $wgDBts2schema;
-               if (isset( $wgDBmwschema ) && isset( $wgDBts2schema )
-                       && $wgDBmwschema !== 'mediawiki'
-                       && preg_match( '/^\w+$/', $wgDBmwschema )
-                       && preg_match( '/^\w+$/', $wgDBts2schema )
-               ) {
-                       $this->doQuery("SET search_path = $wgDBmwschema, $wgDBts2schema, public");
-               }
 
-               return $this->mConn;
+       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));
+                       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 plpgsql in the database <tt>$wgDBname</tt></li>";
+                                       dieout("</ul>");
+                               }
+                       }
+                       else {
+                               print "<b>FAILED</b>. You need to install the language plpgsql in the database <tt>$wgDBname</tt></li>";
+                               dieout("</ul>");
+                       }
+               }
+               print "OK</li>\n";
        }
 
+
        /**
         * Closes a database connection, if it is open
         * Returns success, true if already closed
@@ -523,6 +553,9 @@ class DatabasePostgres extends Database {
        }
 
        function doQuery( $sql ) {
+               if (function_exists('mb_convert_encoding')) {
+                       return $this->mLastResult=pg_query( $this->mConn , mb_convert_encoding($sql,'UTF-8') );
+               }
                return $this->mLastResult=pg_query( $this->mConn , $sql);
        }
 
@@ -629,7 +662,7 @@ class DatabasePostgres extends Database {
         * Returns -1 if count cannot be found
         * Takes same arguments as Database::select()
         */
-       
+
        function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) {
                $options['EXPLAIN'] = true;
                $res = $this->select( $table, $vars, $conds, $fname, $options );
@@ -679,7 +712,7 @@ class DatabasePostgres extends Database {
        /**
         * INSERT wrapper, inserts an array into a table
         *
-        * $args may be a single associative array, or an array of these with numeric keys, 
+        * $args may be a single associative array, or an array of these with numeric keys,
         * for multi-row insert (Postgres version 8.2 and above only).
         *
         * @param array $table   String: Name of the table to insert to.
@@ -692,6 +725,10 @@ class DatabasePostgres extends Database {
        function insert( $table, $args, $fname = 'DatabasePostgres::insert', $options = array() ) {
                global $wgDBversion;
 
+               if ( !count( $args ) ) {
+                       return true;
+               }
+
                $table = $this->tableName( $table );
                if (! isset( $wgDBversion ) ) {
                        $this->getServerVersion();
@@ -779,6 +816,18 @@ class DatabasePostgres extends Database {
                return $this->mInsertId;
        }
 
+       /**
+        * Return the current value of a sequence. Assumes it has ben nextval'ed in this session.
+        */
+       function currentSequenceValue( $seqName ) {
+               $safeseq = preg_replace( "/'/", "''", $seqName );
+               $res = $this->query( "SELECT currval('$safeseq')" );
+               $row = $this->fetchRow( $res );
+               $currval = $row[0];
+               $this->freeResult( $res );
+               return $currval;
+       }
+
        /**
         * Postgres does not have a "USE INDEX" clause, so return an empty string
         */
@@ -883,7 +932,7 @@ class DatabasePostgres extends Database {
                return '';
        }
 
-       function limitResult($sql, $limit,$offset=false) {
+       function limitResult($sql, $limit, $offset=false) {
                return "$sql LIMIT $limit ".(is_numeric($offset)?" OFFSET {$offset} ":"");
        }
 
@@ -917,9 +966,9 @@ class DatabasePostgres extends Database {
 
 
        function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
-               # Ignore errors during error handling to avoid infinite recursion
+               // Ignore errors during error handling to avoid infinite recursion
                $ignore = $this->ignoreErrors( true );
-               ++$this->mErrorCount;
+               $this->mErrorCount++;
 
                if ($ignore || $tempIgnore) {
                        wfDebug("SQL ERROR (ignored): $error\n");
@@ -937,7 +986,7 @@ class DatabasePostgres extends Database {
        /**
         * @return string wikitext of a link to the server software's web site
         */
-       function getSoftwareLink() {
+               function getSoftwareLink() {
                return "[http://www.postgresql.org/ PostgreSQL]";
        }
 
@@ -956,7 +1005,7 @@ class DatabasePostgres extends Database {
 
 
        /**
-        * Query whether a given relation exists (in the given schema, or the 
+        * Query whether a given relation exists (in the given schema, or the
         * default mw one if not given)
         */
        function relationExists( $table, $types, $schema = false ) {
@@ -978,13 +1027,13 @@ class DatabasePostgres extends Database {
        }
 
        /*
-        * For backward compatibility, this function checks both tables and 
+        * For backward compatibility, this function checks both tables and
         * views.
         */
        function tableExists ($table, $schema = false) {
                return $this->relationExists($table, array('r', 'v'), $schema);
        }
-       
+
        function sequenceExists ($sequence, $schema = false) {
                return $this->relationExists($sequence, 'S', $schema);
        }
@@ -1022,8 +1071,8 @@ END;
                global $wgDBmwschema;
                $SQL = sprintf("SELECT 1 FROM information_schema.table_constraints ".
                           "WHERE constraint_schema = %s AND table_name = %s AND constraint_name = %s",
-                       $this->addQuotes($wgDBmwschema),        
-                       $this->addQuotes($table),       
+                       $this->addQuotes($wgDBmwschema),
+                       $this->addQuotes($table),
                        $this->addQuotes($constraint));
                $res = $this->query($SQL);
                if (!$res)
@@ -1094,13 +1143,14 @@ END;
        function setup_database() {
                global $wgVersion, $wgDBmwschema, $wgDBts2schema, $wgDBport, $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 = "mw_test_table";
+               // 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 $wgDBmwschema.$ctest");
+                       $this->doQuery("DROP TABLE $safeschema.$ctest");
                }
-               $SQL = "CREATE TABLE $wgDBmwschema.$ctest(a int)";
+               $SQL = "CREATE TABLE $safeschema.$ctest(a int)";
                $olde = error_reporting( 0 );
                $res = $this->doQuery($SQL);
                error_reporting( $olde );
@@ -1108,19 +1158,9 @@ END;
                        print "<b>FAILED</b>. Make sure that the user \"$wgDBuser\" can write to the schema \"$wgDBmwschema\"</li>\n";
                        dieout("</ul>");
                }
-               $this->doQuery("DROP TABLE $wgDBmwschema.mw_test_table");
+               $this->doQuery("DROP TABLE $safeschema.$ctest");
 
-               dbsource( "../maintenance/postgres/tables.sql", $this);
-
-               ## Version-specific stuff
-               if ($this->numeric_version == 8.1) {
-                       $this->doQuery("CREATE INDEX ts2_page_text ON pagecontent USING gist(textvector)");
-                       $this->doQuery("CREATE INDEX ts2_page_title ON page USING gist(titlevector)");
-               }
-               else {
-                       $this->doQuery("CREATE INDEX ts2_page_text ON pagecontent USING gin(textvector)");
-                       $this->doQuery("CREATE INDEX ts2_page_title ON page USING gin(titlevector)");
-               }
+               $res = dbsource( "../maintenance/postgres/tables.sql", $this);
 
                ## Update version information
                $mwv = $this->addQuotes($wgVersion);
@@ -1191,6 +1231,32 @@ END;
                return true;
        }
 
+       /**
+        * Postgres specific version of replaceVars.
+        * Calls the parent version in Database.php
+        *
+        * @private
+        *
+        * @param string $com SQL string, read from a stream (usually tables.sql)
+        *
+        * @return string SQL string
+        */
+       protected function replaceVars( $ins ) {
+
+               $ins = parent::replaceVars( $ins );
+
+               if ($this->numeric_version >= 8.3) {
+                       // Thanks for not providing backwards-compatibility, 8.3
+                       $ins = preg_replace( "/to_tsvector\s*\(\s*'default'\s*,/", 'to_tsvector(', $ins );
+               }
+
+               if ($this->numeric_version <= 8.1) { // Our minimum version
+                       $ins = str_replace( 'USING gin', 'USING gist', $ins );
+               }
+
+               return $ins;
+       }
+
        /**
         * Various select options
         *
@@ -1214,17 +1280,17 @@ END;
                if ( isset( $options['GROUP BY'] ) ) $preLimitTail .= " GROUP BY " . $options['GROUP BY'];
                if ( isset( $options['HAVING'] ) ) $preLimitTail .= " HAVING {$options['HAVING']}";
                if ( isset( $options['ORDER BY'] ) ) $preLimitTail .= " ORDER BY " . $options['ORDER BY'];
-               
+
                //if (isset($options['LIMIT'])) {
                //      $tailOpts .= $this->limitResult('', $options['LIMIT'],
-               //              isset($options['OFFSET']) ? $options['OFFSET'] 
+               //              isset($options['OFFSET']) ? $options['OFFSET']
                //              : false);
                //}
 
                if ( isset( $noKeyOptions['FOR UPDATE'] ) ) $postLimitTail .= ' FOR UPDATE';
                if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $postLimitTail .= ' LOCK IN SHARE MODE';
                if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) $startOpts .= 'DISTINCT';
-               
+
                return array( $startOpts, $useIndex, $preLimitTail, $postLimitTail );
        }
 
@@ -1236,7 +1302,7 @@ END;
                wfDebug( "Function ping() not written for DatabasePostgres.php yet");
                return true;
        }
-       
+
        /**
         * How lagged is this slave?
         *
@@ -1246,10 +1312,19 @@ END;
                return false;
        }
 
+       function setFakeSlaveLag() {}
+       function setFakeMaster() {}
+
+       function getDBname() {
+               return $this->mDBname;
+       }
+
+       function getServer() {
+               return $this->mServer;
+       }
+
        function buildConcat( $stringList ) {
                return implode( ' || ', $stringList );
        }
 
 } // end DatabasePostgres class
-
-