mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-10-20 17:32:50 +02:00
Code Issues Releases Wiki Activity

* removed static factory DibiDriver::connect()

Browse Source 
* added support for lazy connections
This commit is contained in:
David Grudl
2007-04-25 06:18:06 +00:00
parent 166f716091
commit af7c4de14a
9 changed files with 194 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dibi/drivers/mysql.php
View File

@@ -21,7 +21,6 @@ if (!defined('DIBI')) die();
class DibiMySqlDriver extends DibiDriver
{
private
$conn,
$insertId = FALSE,
$affectedRows = FALSE;
@@ -35,10 +34,10 @@ class DibiMySqlDriver extends DibiDriver
/**
* Driver factory
* @throw DibiException
* @param array connect configuration
* @throw DibiException
*/
public static function connect($config)
public function __construct($config)
{
if (!extension_loaded('mysql'))
throw new DibiException("PHP extension 'mysql' is not loaded");
@@ -57,6 +56,15 @@ class DibiMySqlDriver extends DibiDriver
else
$host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']);
parent::__construct($config);
}
protected function connect()
{
$config = $this->config;
// some errors aren't handled. Must use $php_errormsg
if (function_exists('ini_set'))
$save = ini_set('track_errors', TRUE);
@@ -92,25 +100,24 @@ class DibiMySqlDriver extends DibiDriver
));
}
$obj = new self($config);
$obj->conn = $conn;
return $obj;
return $conn;
}
public function nativeQuery($sql)
{
$this->insertId = $this->affectedRows = FALSE;
$res = @mysql_query($sql, $this->conn);
$conn = $this->getResource();
$res = @mysql_query($sql, $conn);
if ($res === FALSE) return FALSE;
$this->affectedRows = mysql_affected_rows($this->conn);
$this->affectedRows = mysql_affected_rows($conn);
if ($this->affectedRows < 0) $this->affectedRows = FALSE;
$this->insertId = mysql_insert_id($this->conn);
$this->insertId = mysql_insert_id($conn);
if ($this->insertId < 1) $this->insertId = FALSE;
if (is_resource($res))
@@ -134,36 +141,38 @@ class DibiMySqlDriver extends DibiDriver
public function begin()
{
return mysql_query('BEGIN', $this->conn);
return mysql_query('BEGIN', $this->getResource());
}
public function commit()
{
return mysql_query('COMMIT', $this->conn);
return mysql_query('COMMIT', $this->getResource());
}
public function rollback()
{
return mysql_query('ROLLBACK', $this->conn);
return mysql_query('ROLLBACK', $this->getResource());
}
public function errorInfo()
{
$conn = $this->getResource();
return array(
'message' => mysql_error($this->conn),
'code' => mysql_errno($this->conn),
'message' => mysql_error($conn),
'code' => mysql_errno($conn),
);
}
public function escape($value, $appendQuotes=TRUE)
{
$conn = $this->getResource();
return $appendQuotes
? "'" . mysql_real_escape_string($value, $this->conn) . "'"
: mysql_real_escape_string($value, $this->conn);
? "'" . mysql_real_escape_string($value, $conn) . "'"
: mysql_real_escape_string($value, $conn);
}
@@ -192,13 +201,6 @@ class DibiMySqlDriver extends DibiDriver
}
/* is this really needed?
public function getResource()
{
return $this->conn;
}
*/
} // DibiMySqlDriver