summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-08-11 02:17:39 +0000
committerDries Buytaert <dries@buytaert.net>2010-08-11 02:17:39 +0000
commit3f83c075a4a52887dc7cc7478356c97bea958f71 (patch)
treebb8919ebb78c1d8412617791d7e958e620ac952c /includes
parentb45bda8d7b5194c8095ed3266146ce20fc5d560a (diff)
downloadbrdo-3f83c075a4a52887dc7cc7478356c97bea958f71.tar.gz
brdo-3f83c075a4a52887dc7cc7478356c97bea958f71.tar.bz2
- Patch #878198 by pwolanin: add back a method to the DB driver interface that reports the server version.
Diffstat (limited to 'includes')
-rw-r--r--includes/database/database.inc5
-rw-r--r--includes/database/mysql/database.inc5
-rw-r--r--includes/database/pgsql/database.inc4
-rw-r--r--includes/database/sqlite/database.inc4
4 files changed, 18 insertions, 0 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 9e913de90..1ca68eea8 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -1049,6 +1049,11 @@ abstract class DatabaseConnection extends PDO {
abstract public function driver();
/**
+ * Returns the version of the database server.
+ */
+ abstract public function version();
+
+ /**
* Determines if this driver supports transactions.
*
* @return
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index a3d711840..20e6d1f4c 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -79,6 +79,11 @@ 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 22bb8b565..ec3acbb22 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -126,6 +126,10 @@ 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 2998353f6..aa11338a9 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -178,6 +178,10 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
return 'sqlite';
}
+ public function version() {
+ return $this->query('SELECT sqlite_version()')->fetchField();
+ }
+
public function databaseType() {
return 'sqlite';
}