From 227dd89ec801ab891ade7616c2ec19e21ea3b4ac Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Wed, 4 Jan 2012 18:01:10 +0000 Subject: [PATCH] =?utf8?q?re=20r106025=20=E2=80=94=20apply=20follow=20up?= =?utf8?q?=20from=20Luca=20Fulchir?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- includes/db/DatabasePostgres.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 222e3c11b9..4f4636750a 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -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 ) -- 2.20.1