Skip to content

Y
yii2
Commit 8f15fd41 by Qiang Xue
Options

w

parent 760fdf98
Showing with 83 additions and 95 deletions
framework/db/dao/Connection.php
......@@ -580,12 +580,12 @@ class Connection extends \yii\base\ApplicationComponent
public function getStats()
{
$logger = \Yii::getLogger();
$timings = $logger->getProfilingResults(null, 'yii\db\dao\Command::query');
$timings = $logger->getProfiling(array('yii\db\dao\Command::query', 'yii\db\dao\Command::execute'));
$count = count($timings);
$time = array_sum($timings);
$timings = $logger->getProfilingResults(null, 'yii\db\dao\Command::execute');
$count += count($timings);
$time += array_sum($timings);
$time = 0;
foreach ($timings as $timing) {
$time += $timing[1];
}
return array($count, $time);
}
}
framework/db/dao/DataReader.php
<?php
/**
* CDbDataReader class file
* DataReader class file
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008-2011 Yii Software LLC
* @copyright Copyright &copy; 2008-2012 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
/**
* CDbDataReader represents a forward-only stream of rows from a query result set.
* DataReader represents a forward-only stream of rows from a query result set.
*
* To read the current row of data, call {@link read}. The method {@link readAll}
* To read the current row of data, call [[read]]. The method [[readAll]]
* returns all the rows in a single array.
*
* One can also retrieve the rows of data in CDbDataReader by using foreach:
* <pre>
* foreach($reader as $row)
* One can also retrieve the rows of data in DataReader by using `foreach`:
*
* ~~~
* foreach($reader as $row) {
* // $row represents a row of data
* </pre>
* Since CDbDataReader is a forward-only stream, you can only traverse it once.
* }
* ~~~
*
* Since DataReader is a forward-only stream, you can only traverse it once.
*
* It is possible to use a specific mode of data fetching by setting
* {@link setFetchMode FetchMode}. See {@link http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php}
* for more details.
* [[fetchMode]]. See the [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
* for more details about possible fetch mode.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CDbDataReader.php 3204 2011-05-05 21:36:32Z alexander.makarow $
* @package system.db
* @since 1.0
* @since 2.0
*/
class CDbDataReader extends CComponent implements Iterator, Countable
class DataReader extends \yii\base\Component implements \Iterator, \Countable
{
private $_statement;
private $_closed = false;
......@@ -39,12 +40,12 @@ class CDbDataReader extends CComponent implements Iterator, Countable
/**
* Constructor.
* @param CDbCommand $command the command generating the query result
* @param Command $command the command generating the query result
*/
public function __construct(CDbCommand $command)
public function __construct(Command $command)
{
$this->_statement = $command->getPdoStatement();
$this->_statement->setFetchMode(PDO::FETCH_ASSOC);
$this->_statement->setFetchMode(\PDO::FETCH_ASSOC);
}
/**
......@@ -60,11 +61,13 @@ class CDbDataReader extends CComponent implements Iterator, Countable
*/
public function bindColumn($column, &$value, $dataType = null)
{
if ($dataType === null)
if ($dataType === null) {
$this->_statement->bindColumn($column, $value);
else
}
else {
$this->_statement->bindColumn($column, $value, $dataType);
}
}
/**
* Set the default fetch mode for this statement
......@@ -125,8 +128,9 @@ class CDbDataReader extends CComponent implements Iterator, Countable
*/
public function nextResult()
{
if (($result = $this->_statement->nextRowset()) !== false)
if (($result = $this->_statement->nextRowset()) !== false) {
$this->_index = -1;
}
return $result;
}
......@@ -186,17 +190,17 @@ class CDbDataReader extends CComponent implements Iterator, Countable
/**
* Resets the iterator to the initial state.
* This method is required by the interface Iterator.
* @throws CException if this method is invoked twice
* @throws Exception if this method is invoked twice
*/
public function rewind()
{
if ($this->_index < 0)
{
if ($this->_index < 0) {
$this->_row = $this->_statement->fetch();
$this->_index = 0;
}
else
throw new CDbException(Yii::t('yii', 'CDbDataReader cannot rewind. It is a forward-only reader.'));
else {
throw new Exception('DataReader cannot rewind. It is a forward-only reader.');
}
}
/**
......
framework/db/dao/Transaction.php
<?php
/**
* CDbTransaction class file
* Transaction class file.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008-2011 Yii Software LLC
* @copyright Copyright &copy; 2008-2012 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\db\dao;
/**
* CDbTransaction represents a DB transaction.
* Transaction represents a DB transaction.
*
* It is usually created by calling [[Connection::beginTransaction]].
*
* It is usually created by calling {@link CDbConnection::beginTransaction}.
* The following code is a typical example of using transactions (note that some
* DBMS may not support transactions):
*
* The following code is a common scenario of using transactions:
* <pre>
* $transaction=$connection->beginTransaction();
* try
* {
* ~~~
* $transaction = $connection->beginTransaction();
* try {
* $connection->createCommand($sql1)->execute();
* $connection->createCommand($sql2)->execute();
* //.... other SQL executions
* $transaction->commit();
* }
* catch(Exception $e)
* {
* catch(Exception $e) {
* $transaction->rollBack();
* }
* </pre>
* ~~~
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CDbTransaction.php 3069 2011-03-14 00:28:38Z qiang.xue $
* @package system.db
* @since 1.0
* @since 2.0
*/
class CDbTransaction extends CComponent
class Transaction extends \yii\base\Component
{
private $_connection = null;
private $_active;
/**
* @var boolean whether this transaction is active. Only an active transaction
* can [[commit]] or [[rollBack]]. This property is set true when the transaction is started.
*/
public $active;
/**
* @var Connection the database connection that this transaction is associated with.
* This property is set true when the transaction is started.
*/
public $connection;
/**
* Constructor.
* @param CDbConnection $connection the connection associated with this transaction
* @see CDbConnection::beginTransaction
* @param Connection $connection the connection associated with this transaction
* @see Connection::beginTransaction
*/
public function __construct(CDbConnection $connection)
public function __construct($connection)
{
$this->_connection = $connection;
$this->_active = true;
$this->active = true;
$this->connection = $connection;
}
/**
* Commits a transaction.
* @throws CException if the transaction or the DB connection is not active.
* @throws Exception if the transaction or the DB connection is not active.
*/
public function commit()
{
if ($this->_active && $this->_connection->getActive())
{
Yii::trace('Committing transaction', 'system.db.CDbTransaction');
$this->_connection->getPdoInstance()->commit();
$this->_active = false;
if ($this->active && $this->connection->getActive()) {
Yii::trace('Committing transaction', __CLASS__);
$this->connection->pdo->commit();
$this->active = false;
}
else {
throw new Exception('Transaction is inactive and cannot perform commit operation.');
}
else
throw new CDbException(Yii::t('yii', 'CDbTransaction is inactive and cannot perform commit or roll back operations.'));
}
/**
* Rolls back a transaction.
* @throws CException if the transaction or the DB connection is not active.
* @throws Exception if the transaction or the DB connection is not active.
*/
public function rollback()
{
if ($this->_active && $this->_connection->getActive())
{
Yii::trace('Rolling back transaction', 'system.db.CDbTransaction');
$this->_connection->getPdoInstance()->rollBack();
$this->_active = false;
if ($this->active && $this->connection->getActive()) {
Yii::trace('Rolling back transaction', __CLASS__);
$this->connection->pdo->rollBack();
$this->active = false;
}
else
throw new CDbException(Yii::t('yii', 'CDbTransaction is inactive and cannot perform commit or roll back operations.'));
else {
throw new Exception('Transaction is inactive and cannot perform roll back operation.');
}
/**
* @return CDbConnection the DB connection for this transaction
*/
public function getConnection()
{
return $this->_connection;
}
/**
* @return boolean whether this transaction is active
*/
public function getActive()
{
return $this->_active;
}
/**
* @param boolean $value whether this transaction is active
*/
protected function setActive($value)
{
$this->_active = $value;
}
}
framework/validators/Validator.php
......@@ -95,9 +95,9 @@ abstract class Validator extends \yii\base\Component
public $on;
/**
* @var boolean whether this validation rule should be skipped if the attribute being validated
* already has some validation error according to the previous rules. Defaults to false.
* already has some validation error according to the previous rules. Defaults to true.
*/
public $skipOnError = false;
public $skipOnError = true;
/**
* @var boolean whether attributes listed with this validator should be considered safe for
* massive assignment. Defaults to true.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment