[*] Installer : socket management for PDO + refactoring
This commit is contained in:
dMetzger committed
1 parent
60e2943df1
commit
6379dd01bb
1 file changed
+219
-225
+219
-225
@@ -1,225 +1,219 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* 2007-2012 PrestaShop
|
* 2007-2012 PrestaShop
|
||||||
*
|
*
|
||||||
* NOTICE OF LICENSE
|
* NOTICE OF LICENSE
|
||||||
*
|
*
|
||||||
* This source file is subject to the Open Software License (OSL 3.0)
|
* This source file is subject to the Open Software License (OSL 3.0)
|
||||||
* that is bundled with this package in the file LICENSE.txt.
|
* that is bundled with this package in the file LICENSE.txt.
|
||||||
* It is also available through the world-wide-web at this URL:
|
* It is also available through the world-wide-web at this URL:
|
||||||
* http://opensource.org/licenses/osl-3.0.php
|
* http://opensource.org/licenses/osl-3.0.php
|
||||||
* If you did not receive a copy of the license and are unable to
|
* If you did not receive a copy of the license and are unable to
|
||||||
* obtain it through the world-wide-web, please send an email
|
* obtain it through the world-wide-web, please send an email
|
||||||
* to license@prestashop.com so we can send you a copy immediately.
|
* to license@prestashop.com so we can send you a copy immediately.
|
||||||
*
|
*
|
||||||
* DISCLAIMER
|
* DISCLAIMER
|
||||||
*
|
*
|
||||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||||
* versions in the future. If you wish to customize PrestaShop for your
|
* versions in the future. If you wish to customize PrestaShop for your
|
||||||
* needs please refer to http://www.prestashop.com for more information.
|
* needs please refer to http://www.prestashop.com for more information.
|
||||||
*
|
*
|
||||||
* @author PrestaShop SA <contact@prestashop.com>
|
* @author PrestaShop SA <contact@prestashop.com>
|
||||||
* @copyright 2007-2012 PrestaShop SA
|
* @copyright 2007-2012 PrestaShop SA
|
||||||
* @version Release: $Revision$
|
* @version Release: $Revision$
|
||||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||||
* International Registered Trademark & Property of PrestaShop SA
|
* International Registered Trademark & Property of PrestaShop SA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is currently only here for tests
|
* This class is currently only here for tests
|
||||||
*
|
*
|
||||||
* @since 1.5.0
|
* @since 1.5.0
|
||||||
*/
|
*/
|
||||||
class DbPDOCore extends Db
|
class DbPDOCore extends Db
|
||||||
{
|
{
|
||||||
/**
|
protected static function _getPDO($host, $user, $password, $dbname, $timeout = 5)
|
||||||
* @see DbCore::connect()
|
{
|
||||||
*/
|
$dsn = 'mysql:';
|
||||||
public function connect()
|
if ($dbname)
|
||||||
{
|
$dsn .= 'dbname='.$dbname.';';
|
||||||
try
|
if (preg_match('/^(.*):([0-9]+)$/', $host, $matches))
|
||||||
{
|
$dsn .= 'host='.$matches[1].';port='.$matches[2];
|
||||||
$dsn = 'mysql:dbname='.$this->database;
|
elseif (preg_match('#^.*:(/.*)$#', $host, $matches))
|
||||||
if (strpos($this->server, ':') !== false)
|
$dsn .= 'unix_socket='.$matches[1];
|
||||||
{
|
else
|
||||||
list($server, $port) = explode(':', $this->server);
|
$dsn .= 'host='.$host;
|
||||||
$dsn .= ';host='.$server.';port='.$port;
|
|
||||||
}
|
return new PDO($dsn, $user, $password, array(PDO::ATTR_TIMEOUT => $timeout));
|
||||||
else
|
}
|
||||||
$dsn .= ';host='.$this->server;
|
|
||||||
|
/**
|
||||||
$this->link = new PDO($dsn, $this->user, $this->password);
|
* @see DbCore::connect()
|
||||||
}
|
*/
|
||||||
catch (PDOException $e)
|
public function connect()
|
||||||
{
|
{
|
||||||
throw new PrestaShopDatabaseException(sprintf(Tools::displayError('Link to database cannot be established: %s'), $e->getMessage()));
|
try {
|
||||||
}
|
$this->link = $this->_getPDO($this->server, $this->user, $this->password, $this->database, 5);
|
||||||
|
} catch (PDOException $e) {
|
||||||
// UTF-8 support
|
throw new PrestaShopDatabaseException(sprintf(Tools::displayError('Link to database cannot be established: %s'), $e->getMessage()));
|
||||||
if ($this->link->exec('SET NAMES \'utf8\'') === false)
|
}
|
||||||
throw new PrestaShopDatabaseException(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.'));
|
|
||||||
|
// UTF-8 support
|
||||||
return $this->link;
|
if ($this->link->exec('SET NAMES \'utf8\'') === false)
|
||||||
}
|
throw new PrestaShopDatabaseException(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.'));
|
||||||
|
|
||||||
/**
|
return $this->link;
|
||||||
* @see DbCore::disconnect()
|
}
|
||||||
*/
|
|
||||||
public function disconnect()
|
/**
|
||||||
{
|
* @see DbCore::disconnect()
|
||||||
unset($this->link);
|
*/
|
||||||
}
|
public function disconnect()
|
||||||
|
{
|
||||||
/**
|
unset($this->link);
|
||||||
* @see DbCore::_query()
|
}
|
||||||
*/
|
|
||||||
protected function _query($sql)
|
/**
|
||||||
{
|
* @see DbCore::_query()
|
||||||
return $this->link->query($sql);
|
*/
|
||||||
}
|
protected function _query($sql)
|
||||||
|
{
|
||||||
/**
|
return $this->link->query($sql);
|
||||||
* @see DbCore::nextRow()
|
}
|
||||||
*/
|
|
||||||
public function nextRow($result = false)
|
/**
|
||||||
{
|
* @see DbCore::nextRow()
|
||||||
if (!$result)
|
*/
|
||||||
$result = $this->result;
|
public function nextRow($result = false)
|
||||||
return $result->fetch(PDO::FETCH_ASSOC);
|
{
|
||||||
}
|
if (!$result)
|
||||||
|
$result = $this->result;
|
||||||
/**
|
return $result->fetch(PDO::FETCH_ASSOC);
|
||||||
* @see DbCore::_numRows()
|
}
|
||||||
*/
|
|
||||||
protected function _numRows($result)
|
/**
|
||||||
{
|
* @see DbCore::_numRows()
|
||||||
return $result->rowCount();
|
*/
|
||||||
}
|
protected function _numRows($result)
|
||||||
|
{
|
||||||
/**
|
return $result->rowCount();
|
||||||
* @see DbCore::Insert_ID()
|
}
|
||||||
*/
|
|
||||||
public function Insert_ID()
|
/**
|
||||||
{
|
* @see DbCore::Insert_ID()
|
||||||
return $this->link->lastInsertId();
|
*/
|
||||||
}
|
public function Insert_ID()
|
||||||
|
{
|
||||||
/**
|
return $this->link->lastInsertId();
|
||||||
* @see DbCore::Affected_Rows()
|
}
|
||||||
*/
|
|
||||||
public function Affected_Rows()
|
/**
|
||||||
{
|
* @see DbCore::Affected_Rows()
|
||||||
return $this->result->rowCount();
|
*/
|
||||||
}
|
public function Affected_Rows()
|
||||||
|
{
|
||||||
/**
|
return $this->result->rowCount();
|
||||||
* @see DbCore::getMsgError()
|
}
|
||||||
*/
|
|
||||||
public function getMsgError($query = false)
|
/**
|
||||||
{
|
* @see DbCore::getMsgError()
|
||||||
$error = $this->link->errorInfo();
|
*/
|
||||||
return ($error[0] == '00000') ? '' : $error[2];
|
public function getMsgError($query = false)
|
||||||
}
|
{
|
||||||
|
$error = $this->link->errorInfo();
|
||||||
/**
|
return ($error[0] == '00000') ? '' : $error[2];
|
||||||
* @see DbCore::getNumberError()
|
}
|
||||||
*/
|
|
||||||
public function getNumberError()
|
/**
|
||||||
{
|
* @see DbCore::getNumberError()
|
||||||
$error = $this->link->errorInfo();
|
*/
|
||||||
return isset($error[1]) ? $error[1] : 0;
|
public function getNumberError()
|
||||||
}
|
{
|
||||||
|
$error = $this->link->errorInfo();
|
||||||
/**
|
return isset($error[1]) ? $error[1] : 0;
|
||||||
* @see DbCore::getVersion()
|
}
|
||||||
*/
|
|
||||||
public function getVersion()
|
/**
|
||||||
{
|
* @see DbCore::getVersion()
|
||||||
return $this->getValue('SELECT VERSION()');
|
*/
|
||||||
}
|
public function getVersion()
|
||||||
|
{
|
||||||
/**
|
return $this->getValue('SELECT VERSION()');
|
||||||
* @see DbCore::_escape()
|
}
|
||||||
*/
|
|
||||||
public function _escape($str)
|
/**
|
||||||
{
|
* @see DbCore::_escape()
|
||||||
$search = array("\\", "\0", "\n", "\r", "\x1a", "'", '"');
|
*/
|
||||||
$replace = array("\\\\", "\\0", "\\n", "\\r", "\Z", "\'", '\"');
|
public function _escape($str)
|
||||||
|
{
|
||||||
return str_replace($search, $replace, $str);
|
$search = array('\\', '\0', '\n', '\r', '\x1a', ''', ''');
|
||||||
}
|
$replace = array('\\\\', '\\0', '\\n', '\\r', '\Z', '\'', '\'');
|
||||||
|
|
||||||
/**
|
return str_replace($search, $replace, $str);
|
||||||
* @see DbCore::set_db()
|
}
|
||||||
*/
|
|
||||||
public function set_db($db_name)
|
/**
|
||||||
{
|
* @see DbCore::set_db()
|
||||||
return $this->link->exec('USE '.pSQL($db_name));
|
*/
|
||||||
}
|
public function set_db($db_name)
|
||||||
|
{
|
||||||
/**
|
return $this->link->exec('USE '.pSQL($db_name));
|
||||||
* @see Db::hasTableWithSamePrefix()
|
}
|
||||||
*/
|
|
||||||
public static function hasTableWithSamePrefix($server, $user, $pwd, $db, $prefix)
|
/**
|
||||||
{
|
* @see Db::hasTableWithSamePrefix()
|
||||||
try
|
*/
|
||||||
{
|
public static function hasTableWithSamePrefix($server, $user, $pwd, $db, $prefix)
|
||||||
$link = @new PDO('mysql:dbname='.$db.';host='.$server, $user, $pwd);
|
{
|
||||||
}
|
try {
|
||||||
catch (PDOException $e)
|
$link = DbPDO::_getPDO($server, $user, $pwd, $db, 5);
|
||||||
{
|
} catch (PDOException $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql = 'SHOW TABLES LIKE \''.$prefix.'%\'';
|
$sql = 'SHOW TABLES LIKE \''.$prefix.'%\'';
|
||||||
$result = $link->query($sql);
|
$result = $link->query($sql);
|
||||||
return (bool)$result->fetch();
|
return (bool)$result->fetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see Db::checkConnection()
|
* @see Db::checkConnection()
|
||||||
*/
|
*/
|
||||||
public static function tryToConnect($server, $user, $pwd, $db, $newDbLink = true, $engine = null, $timeout = 5)
|
public static function tryToConnect($server, $user, $pwd, $db, $newDbLink = true, $engine = null, $timeout = 5)
|
||||||
{
|
{
|
||||||
try
|
try {
|
||||||
{
|
$link = DbPDO::_getPDO($server, $user, $pwd, $db, $timeout);
|
||||||
$link = @new PDO('mysql:dbname='.$db.';host='.$server, $user, $pwd, array(PDO::ATTR_TIMEOUT => $timeout));
|
} catch (PDOException $e) {
|
||||||
}
|
return ($e->getCode() == 1049) ? 2 : 1;
|
||||||
catch (PDOException $e)
|
}
|
||||||
{
|
|
||||||
return ($e->getCode() == 1049) ? 2 : 1;
|
if (strtolower($engine) == 'innodb')
|
||||||
}
|
{
|
||||||
|
$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
|
||||||
if (strtolower($engine) == 'innodb')
|
$result = $link->query($sql);
|
||||||
{
|
if (!$result)
|
||||||
$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
|
return 4;
|
||||||
$result = $link->query($sql);
|
$row = $result->fetch();
|
||||||
if (!$result)
|
if (!$row || strtolower($row['Value']) != 'yes')
|
||||||
return 4;
|
return 4;
|
||||||
$row = $result->fetch();
|
}
|
||||||
if (!$row || strtolower($row['Value']) != 'yes')
|
unset($link);
|
||||||
return 4;
|
return 0;
|
||||||
}
|
}
|
||||||
unset($link);
|
|
||||||
return 0;
|
/**
|
||||||
}
|
* @see Db::checkEncoding()
|
||||||
|
*/
|
||||||
/**
|
public static function tryUTF8($server, $user, $pwd)
|
||||||
* @see Db::checkEncoding()
|
{
|
||||||
*/
|
try {
|
||||||
static public function tryUTF8($server, $user, $pwd)
|
$link = DbPDO::_getPDO($server, $user, $pwd, false, 5);
|
||||||
{
|
} catch (PDOException $e) {
|
||||||
try
|
return false;
|
||||||
{
|
}
|
||||||
$link = new PDO('mysql:host='.$server, $user, $pwd);
|
$result = $link->exec('SET NAMES \'utf8\'');
|
||||||
}
|
unset($link);
|
||||||
catch (PDOException $e)
|
|
||||||
{
|
return ($result === false) ? false : true;
|
||||||
return false;
|
}
|
||||||
}
|
}
|
||||||
$result = $link->exec('SET NAMES \'utf8\'');
|
|
||||||
unset($link);
|
|
||||||
|
|
||||||
return ($result === false) ? false : true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user