Revert r36755 for the moment; various things use 'new Database'

or Database::newFromParams() explicitly at the moment. While that's already bad (breaking PG support etc), I'd rather see those get fixed before we go introducing differences between Database and DatabaseMySql.

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 2d31193..3be45d3 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2235,32 +2235,6 @@ class Database {
                return 'CONCAT(' . implode( ',', $stringList ) . ')';
        }
        
-       /**
-        * Acquire a lock, no-op to be overridden
-        * by subclasses as needed.
-        */
-       public function lock( $lockName, $method ) {
-               return true;
-       }
-       /**
-        * Release a lock, no-op to be overridden
-        * by subclasses as needed.
-        */
-       public function unlock( $lockName, $method ) {
-               return true;
-       }
-}
-
-/**
- * Database abstraction object for mySQL
- * Inherit all methods and properties of Database::Database(),
- * except for locking.
- *
- * @ingroup Database
- * @see Database
- */
-class DatabaseMysql extends Database {
-       
        /**
         * Acquire a lock
         * 
@@ -2284,7 +2258,6 @@ class DatabaseMysql extends Database {
                        return false;
                }
        }
-       
        /**
         * Release a lock.
         * 
@@ -2301,6 +2274,17 @@ class DatabaseMysql extends Database {
        }
 }
 
+/**
+ * Database abstraction object for mySQL
+ * Inherit all methods and properties of Database::Database()
+ *
+ * @ingroup Database
+ * @see Database
+ */
+class DatabaseMysql extends Database {
+       # Inherit all
+}
+
 /******************************************************************************
  * Utility classes
  *****************************************************************************/

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index a6dda25..7334244 100755 (executable)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -997,6 +997,16 @@ class DatabaseMssql extends Database {
                        $this->query("$sql $matches[1],$matches[2])");
                }
        }
+       
+       /** 
+        * No-op lock functions
+        */
+       public function lock( $lockName, $method ) {
+               return true;
+       }
+       public function unlock( $lockName, $method ) {
+               return true;
+       }
 
 }
 

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 8d2a675..d03298e 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -706,5 +706,15 @@ echo "error!\n";
        function getServer() {
                return $this->mServer;
        }
+       
+       /** 
+        * No-op lock functions
+        */
+       public function lock( $lockName, $method ) {
+               return true;
+       }
+       public function unlock( $lockName, $method ) {
+               return true;
+       }
 
 } // end DatabaseOracle class

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 8f8488b..a0d3d69 100644 (file)
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1327,4 +1327,13 @@ END;
                return implode( ' || ', $stringList );
        }
 
+       /* These are not used yet, but we know we don't want the default version */
+
+       public function lock( $lockName, $method ) {
+               return true;
+       }
+       public function unlock( $lockName, $method ) {
+               return true;
+       }
+
 } // end DatabasePostgres class

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 8b4466e..5299c68 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -373,6 +373,16 @@ class DatabaseSqlite extends Database {
                        $this->query("$sql $matches[1],$matches[2])");
                }
        }
+       
+       /** 
+        * No-op lock functions
+        */
+       public function lock( $lockName, $method ) {
+               return true;
+       }
+       public function unlock( $lockName, $method ) {
+               return true;
+       }
 
 }