re r106025 — apply follow up from Luca Fulchir
authorMark A. Hershberger <mah@users.mediawiki.org>
Wed, 4 Jan 2012 18:01:10 +0000 (18:01 +0000)
committerMark A. Hershberger <mah@users.mediawiki.org>
Wed, 4 Jan 2012 18:01:10 +0000 (18:01 +0000)
includes/db/DatabasePostgres.php

index 222e3c1..4f46367 100644 (file)
@@ -645,7 +645,7 @@ class DatabasePostgres extends DatabaseBase {
                        $schema = '"' . $dbDetails[0] . '".';
                        $table  = $dbDetails [1];
                } else {
-                       $schema = "\"{$wgDBmwschema}\"."; # keep old schema, but quote it.
+                       $schema = ""; # do NOT force the schema (due to temporary tables)
                        $table = $dbDetails[0];
                }
                if ( $format != 'quoted' ) {
@@ -659,11 +659,6 @@ class DatabasePostgres extends DatabaseBase {
                        }
                }
 
-               # during installation wgDBmwschema is not set, so we would end up quering
-               # ""."table" => error. Erase the first part if wgDBmwschema is empty
-               if ( $schema == "\"\"." ) {
-                       $schema = "";
-               }
                if ( isset( $wgSharedDB ) # We have a shared database (=> schema)
                  && isset( $wgSharedTables )
                  && is_array( $wgSharedTables )