dumpBackup should instantiate correct database class for db type

add set_timeout() method to Database

diff --git a/includes/Database.php b/includes/Database.php
index d51553f..96dcc1b 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1967,6 +1967,11 @@ class Database {
                return $b;
        }
 
+       function set_timeout($timeout) {
+               $this->query( "SET net_read_timeout=$timeout" );
+               $this->query( "SET net_write_timeout=$timeout" );
+       }
+
        /**
         * Read and execute SQL commands from a file.
         * Returns true on success, error string on failure

diff --git a/includes/DatabasePostgres.php b/includes/DatabasePostgres.php
index e479a6a..b55cbc1 100644 (file)
--- a/includes/DatabasePostgres.php
+++ b/includes/DatabasePostgres.php
@@ -937,6 +937,9 @@ class DatabasePostgres extends Database {
                return array( $startOpts, $useIndex, $tailOpts );
        }
 
+       function set_timeout($timeout) {
+       }
+
        function ping() {
                wfDebug( "Function ping() not written for DatabasePostgres.php yet");
                return true;

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 2c3ce6b..b770c5c 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -216,12 +216,13 @@ class BackupDumper {
 
        function &backupDb() {
                global $wgDBadminuser, $wgDBadminpassword;
-               global $wgDBname, $wgDebugDumpSql;
+               global $wgDBname, $wgDebugDumpSql, $wgDBtype;
                $flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
-               $db = new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
+
+               $class = 'Database' . ucfirst($wgDBtype);
+               $db = new $class( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
                $timeout = 3600 * 24;
-               $db->query( "SET net_read_timeout=$timeout" );
-               $db->query( "SET net_write_timeout=$timeout" );
+               $db->set_timeout($timeout);
                return $db;
        }