dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] Classes: add PDO support if extension is activated

Browse Source 
[*] Classes: add engine check (innodb)
This commit is contained in:
rMalie
2011-10-13 15:00:08 +00:00
parent f8fb147034
commit cf4db864d3
5 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/db/DbPDO.php
+19 -8
View File
@@ -84,7 +84,7 @@ class DbPDOCore extends Db
*/
protected function _numRows($result)
{
return $result->rowCount();;
return $result->rowCount();
}
/**
@@ -151,17 +151,28 @@ class DbPDOCore extends Db
/**
* @see DbCore::tryToConnect()
*/
static public function tryToConnect($server, $user, $pwd, $db)
static public function tryToConnect($server, $user, $pwd, $db, $newDbLink = true, $engine = null)
{
try
{
$test = new PDO('mysql:dbname='.$db.';host='.$server, $user, $pwd);
$link = @new PDO('mysql:dbname='.$db.';host='.$server, $user, $pwd);
}
catch (PDOException $e)
{
return 1;
return ($e->getCode() == 1049) ? 2 : 1;
}
unset($test);
if (strtolower($engine) == 'innodb')
{
$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
$result = $link->query($sql);
if (!$result)
return 4;
$row = $result->fetch();
if (!$row || strtolower($row['Value']) != 'yes')
return 4;
}
unset($link);
return 0;
}
@@ -172,14 +183,14 @@ class DbPDOCore extends Db
{
try
{
$test = new PDO('mysql:dbname='.$db.';host='.$server, $user, $pwd);
$link = new PDO('mysql:host='.$server, $user, $pwd);
}
catch (PDOException $e)
{
return false;
}
$result = $test->exec('SET NAMES \'utf8\'');
unset($test);
$result = $link->exec('SET NAMES \'utf8\'');
unset($link);
return ($result === false) ? false : true;
}