Skip to content

Commit 1e91318

Browse files
authored
Merge pull request #267 from shreesh-webkul/qlo-remove-mysql2
Removed MySQL support, PDO MySQL required
2 parents 7ffdae1 + fb6cfe6 commit 1e91318

File tree

6 files changed

+12
-408
lines changed

6 files changed

+12
-408
lines changed

classes/ConfigurationTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static function getDefaultTests()
8383
),
8484
'phpversion' => false,
8585
'gd' => false,
86-
'mysql_support' => false,
86+
'pdo_mysql' => false,
8787
'config_dir' => 'config',
8888
'files' => false,
8989
'mails_dir' => 'mails',
@@ -117,7 +117,6 @@ public static function getDefaultTestsOp()
117117
'mbstring' => false,
118118
'magicquotes' => false,
119119
'dom' => false,
120-
'pdo_mysql' => false,
121120
);
122121
}
123122

@@ -156,7 +155,7 @@ public static function test_new_phpversion()
156155

157156
public static function test_mysql_support()
158157
{
159-
return extension_loaded('mysql') || extension_loaded('mysqli') || extension_loaded('pdo_mysql');
158+
return extension_loaded('mysqli') || extension_loaded('pdo_mysql');
160159
}
161160

162161
public static function test_pdo_mysql()

classes/db/Db.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,17 @@ protected static function loadSlaveServers()
284284
*/
285285
public static function getClass()
286286
{
287-
$class = 'MySQL';
287+
$class = '';
288288
if (PHP_VERSION_ID >= 50200 && extension_loaded('pdo_mysql')) {
289289
$class = 'DbPDO';
290290
} elseif (extension_loaded('mysqli')) {
291291
$class = 'DbMySQLi';
292292
}
293293

294+
if (empty($class)) {
295+
throw new PrestaShopException('Cannot select any valid SQL engine.');
296+
}
297+
294298
return $class;
295299
}
296300

0 commit comments

Comments
 (0)