Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for pre-existing test table, commit only if setup completes.

Browse source
This commit is contained in:
Greg Sabino Mullane 2007-03-26 00:12:26 +00:00
parent af8440f164
commit bca55fa58f
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/DatabasePostgres.php
View file

@ -908,7 +908,11 @@ END;
## Make sure that we can write to the correct schema
## If not, Postgres will happily and silently go to the next search_path item
$SQL = "CREATE TABLE $wgDBmwschema.mw_test_table(a int)";
$ctest = "mw_test_table";
if ($this->tableExists($ctest, $wgDBmwschema)) {
$this->doQuery("DROP TABLE $wgDBmwschema.$ctest");
}
$SQL = "CREATE TABLE $wgDBmwschema.$ctest(a int)";
error_reporting( 0 );
$res = $this->doQuery($SQL);
error_reporting( E_ALL );
@ -916,6 +920,7 @@ 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");
dbsource( "../maintenance/postgres/tables.sql", $this);
@ -961,6 +966,8 @@ END;
$this->query("$SQL $matches[1],$matches[2])");
}
print " (table interwiki successfully populated)...\n";
$this->doQuery("COMMIT");
}
function encodeBlob($b) {

1
maintenance/postgres/tables.sql
View file

@ -514,4 +514,3 @@ INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date)
VALUES ('Creation','??','$LastChangedRevision$','$LastChangedDate$');
COMMIT;