Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-07 00:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(Fixes issue 1868)

Browse Source
This commit is contained in:
qiang.xue
2011-03-14 00:28:38 +00:00
parent 487cc6f600
commit dc99b7cdeb
13 changed files with 26 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
framework/db/CDbConnection.php
View File

@@ -429,14 +429,11 @@ class CDbConnection extends CApplicationComponent
* for more details about how to pass an array as the query. If this parameter is not given,
* you will have to call query builder methods of {@link CDbCommand} to build the DB query.
* @return CDbCommand the DB command
* @throws CException if the connection is not active
*/
public function createCommand($query=null)
{
if($this->getActive())
return new CDbCommand($this,$query);
else
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$this->setActive(true);
return new CDbCommand($this,$query);
}
/**
@@ -456,23 +453,17 @@ class CDbConnection extends CApplicationComponent
/**
* Starts a transaction.
* @return CDbTransaction the transaction initiated
* @throws CException if the connection is not active
*/
public function beginTransaction()
{
if($this->getActive())
{
$this->_pdo->beginTransaction();
return $this->_transaction=new CDbTransaction($this);
}
else
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$this->setActive(true);
$this->_pdo->beginTransaction();
return $this->_transaction=new CDbTransaction($this);
}
/**
* Returns the database schema for the current connection
* @return CDbSchema the database schema for the current connection
* @throws CException if the connection is not active yet
*/
public function getSchema()
{
@@ -480,9 +471,7 @@ class CDbConnection extends CApplicationComponent
return $this->_schema;
else
{
if(!$this->getActive())
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$driver=strtolower($this->getDriverName());
$driver=$this->getDriverName();
if(isset($this->driverMap[$driver]))
return $this->_schema=Yii::createComponent($this->driverMap[$driver], $this);
else
@@ -509,10 +498,8 @@ class CDbConnection extends CApplicationComponent
*/
public function getLastInsertID($sequenceName='')
{
if($this->getActive())
return $this->_pdo->lastInsertId($sequenceName);
else
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$this->setActive(true);
return $this->_pdo->lastInsertId($sequenceName);
}
/**
@@ -526,15 +513,11 @@ class CDbConnection extends CApplicationComponent
if(is_int($str) || is_float($str))
return $str;
if($this->getActive())
{
if(($value=$this->_pdo->quote($str))!==false)
return $value;
else // the driver doesn't support quote (e.g. oci)
return "'" . addcslashes(str_replace("'", "''", $str), "\000\n\r\\\032") . "'";
}
else
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$this->setActive(true);
if(($value=$this->_pdo->quote($str))!==false)
return $value;
else // the driver doesn't support quote (e.g. oci)
return "'" . addcslashes(str_replace("'", "''", $str), "\000\n\r\\\032") . "'";
}
/**
@@ -662,7 +645,9 @@ class CDbConnection extends CApplicationComponent
*/
public function getDriverName()
{
return $this->getAttribute(PDO::ATTR_DRIVER_NAME);
if(($pos=strpos($this->connectionString, ':'))!==false)
return strtolower(substr($this->connectionString, 0, $pos));
// return $this->getAttribute(PDO::ATTR_DRIVER_NAME);
}
/**
@@ -728,10 +713,8 @@ class CDbConnection extends CApplicationComponent
*/
public function getAttribute($name)
{
if($this->getActive())
return $this->_pdo->getAttribute($name);
else
throw new CDbException(Yii::t('yii','CDbConnection is inactive and cannot perform any DB operations.'));
$this->setActive(true);
return $this->_pdo->getAttribute($name);
}
/**