- Patch #878198 by pwolanin, Damien Tournoud: add back a method to the DB driver interface that reports the server version.

4 files changed, 3 insertions, 14 deletions

diff --git a/includes/database/database.inc b/includes/database/database.inc
index 4131f91fd..9ca77ea50 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -1069,7 +1069,9 @@ abstract class DatabaseConnection extends PDO {
   /**
    * Returns the version of the database server.
    */
-  abstract public function version();
+  public function version() {
+    return $this->getAttribute(PDO::ATTR_SERVER_VERSION);
+  }
 
   /**
    * Determines if this driver supports transactions.
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 20e6d1f4c..a3d711840 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -79,11 +79,6 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     return 'mysql';
   }
 
-  public function version() {
-    $data = $this->query('SHOW variables LIKE :name', array(':name' => 'version'))->fetchAssoc();
-    return $data['value'];
-  }
-
   public function databaseType() {
     return 'mysql';
   }
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc
index e6e6eef96..d38b64afe 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -126,10 +126,6 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     return 'pgsql';
   }
 
-  public function version() {
-    return $this->query('SHOW SERVER_VERSION')->fetchField();
-  }
-
   public function databaseType() {
     return 'pgsql';
   }
diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc
index 476876d3e..9a778c76c 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -182,10 +182,6 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
     return 'sqlite';
   }
 
-  public function version() {
-    return $this->query('SELECT sqlite_version()')->fetchField();
-  }
-
   public function databaseType() {
     return 'sqlite';
   }