refs #1612 : bugfix - MySQLi adapter did not return correct DBMS

version. refs #1579 : enhanced - simpler permission instructions. -
Needlworks · Nov 7, 2014 · 5c6697e · 5c6697e
1 parent fd619d3
commit 5c6697e
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 71 deletions.
diff --git a/framework/data/MySQL/Adapter.php b/framework/data/MySQL/Adapter.php
@@ -46,8 +46,7 @@ public static function dbms() {
 	public static function version($mode = 'server') {
 		if (array_key_exists('version', self::$dbProperties)) return self::$dbProperties['version'];
 		else {
-			$version = self::queryRow("SHOW VARIABLES LIKE 'version'");
-			self::$dbProperties['version'] = $version['Value'];
+			self::$dbProperties['version'] = self::queryCell("SELECT VERSION()");
 			return self::$dbProperties['version'];
 		}
 	}

diff --git a/framework/data/MySQLi/Adapter.php b/framework/data/MySQLi/Adapter.php
@@ -55,7 +55,7 @@ public static function dbms() {
 	public static function version($mode = "server") {
 		if (array_key_exists('version', self::$dbProperties)) return self::$dbProperties['version'];
 		else {
-			self::$dbProperties['version'] = self::queryCell("SHOW VARIABLES LIKE 'version'");
+			self::$dbProperties['version'] = self::queryCell("SELECT VERSION()");
 			return self::$dbProperties['version'];
 		}
 	}