Skip to content

Y
yii2
Commit eaf60e14 by Qiang Xue
Options

w

parent 00215994
Showing with 96 additions and 71 deletions
framework/db/ar/ActiveRecord.php
<?php <?php
/** /**
* CActiveRecord class file. * ActiveRecord class file.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/ * @link http://www.yiiframework.com/
...@@ -8,27 +8,61 @@ ...@@ -8,27 +8,61 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
namespace yii\db\ar;
/*
1. query
$finder = Post::model()->find(array(
'select' => 'id, title',
'where' => 'id=123',
'with' => array(
'creator' => array(
),
),
));
$post = $finder->first();
$posts = $finder->all();
foreach($finder as $post) {
}
foreach($finder->next(5) as $posts) {
}
2. insert
$post = Post::create();
$post->attributes = $_POST['Post'];
$post->save();
3. update
4. delete
*/
/** /**
* CActiveRecord is the base class for classes representing relational data. * ActiveRecord is the base class for classes representing relational data.
* *
* It implements the active record design pattern, a popular Object-Relational Mapping (ORM) technique. * It implements the active record design pattern, a popular Object-Relational Mapping (ORM) technique.
* Please check {@link http://www.yiiframework.com/doc/guide/database.ar the Guide} for more details * Please check {@link http://www.yiiframework.com/doc/guide/database.ar the Guide} for more details
* about this class. * about this class.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
* *
* @property array $attributes * @property array $attributes
*/ */
abstract class CActiveRecord extends CModel abstract class ActiveRecord extends \yii\base\Model
{ {
const BELONGS_TO = 'CBelongsToRelation'; const BELONGS_TO = 'CBelongsToRelation';
const HAS_ONE = 'CHasOneRelation'; const HAS_ONE = 'CHasOneRelation';
const HAS_MANY = 'CHasManyRelation'; const HAS_MANY = 'CHasManyRelation';
const MANY_MANY = 'CManyManyRelation'; const MANY_MANY = 'CManyManyRelation';
const STAT = 'CStatRelation';
/** /**
* @var CDbConnection the default database connection for all active record classes. * @var CDbConnection the default database connection for all active record classes.
...@@ -68,18 +102,6 @@ abstract class CActiveRecord extends CModel ...@@ -68,18 +102,6 @@ abstract class CActiveRecord extends CModel
} }
/** /**
* Initializes this model.
* This method is invoked when an AR instance is newly created and has
* its {@link scenario} set.
* You may override this method to provide code that is needed to initialize the model (e.g. setting
* initial property values.)
* @since 1.0.8
*/
public function init()
{
}
/**
* Sets the parameters about query caching. * Sets the parameters about query caching.
* This is a shortcut method to {@link CDbConnection::cache()}. * This is a shortcut method to {@link CDbConnection::cache()}.
* It changes the query caching parameter of the {@link dbConnection} instance. * It changes the query caching parameter of the {@link dbConnection} instance.
...@@ -88,7 +110,7 @@ abstract class CActiveRecord extends CModel ...@@ -88,7 +110,7 @@ abstract class CActiveRecord extends CModel
* @param CCacheDependency $dependency the dependency that will be used when saving the query results into cache. * @param CCacheDependency $dependency the dependency that will be used when saving the query results into cache.
* @param integer $queryCount number of SQL queries that need to be cached after calling this method. Defaults to 1, * @param integer $queryCount number of SQL queries that need to be cached after calling this method. Defaults to 1,
* meaning that the next SQL query will be cached. * meaning that the next SQL query will be cached.
* @return CActiveRecord the active record instance itself. * @return ActiveRecord the active record instance itself.
* @since 1.1.7 * @since 1.1.7
*/ */
public function cache($duration, $dependency = null, $queryCount = 1) public function cache($duration, $dependency = null, $queryCount = 1)
...@@ -239,7 +261,7 @@ abstract class CActiveRecord extends CModel ...@@ -239,7 +261,7 @@ abstract class CActiveRecord extends CModel
throw new CDbException(Yii::t('yii', '{class} does not have relation "{name}".', throw new CDbException(Yii::t('yii', '{class} does not have relation "{name}".',
array('{class}' => get_class($this), '{name}' => $name))); array('{class}' => get_class($this), '{name}' => $name)));
Yii::trace('lazy loading ' . get_class($this) . '.' . $name, 'system.db.ar.CActiveRecord'); Yii::trace('lazy loading ' . get_class($this) . '.' . $name, 'system.db.ar.ActiveRecord');
$relation = $md->relations[$name]; $relation = $md->relations[$name];
if ($this->getIsNewRecord() && !$refresh && ($relation instanceof CHasOneRelation || $relation instanceof CHasManyRelation)) if ($this->getIsNewRecord() && !$refresh && ($relation instanceof CHasOneRelation || $relation instanceof CHasManyRelation))
return $relation instanceof CHasOneRelation ? null : array(); return $relation instanceof CHasOneRelation ? null : array();
...@@ -337,7 +359,7 @@ abstract class CActiveRecord extends CModel ...@@ -337,7 +359,7 @@ abstract class CActiveRecord extends CModel
/** /**
* Resets all scopes and criterias applied including default scope. * Resets all scopes and criterias applied including default scope.
* *
* @return CActiveRecord * @return ActiveRecord
* @since 1.1.2 * @since 1.1.2
*/ */
public function resetScope() public function resetScope()
...@@ -360,7 +382,7 @@ abstract class CActiveRecord extends CModel ...@@ -360,7 +382,7 @@ abstract class CActiveRecord extends CModel
* </pre> * </pre>
* *
* @param string $className active record class name. * @param string $className active record class name.
* @return CActiveRecord active record model instance. * @return ActiveRecord active record model instance.
*/ */
public static function model($className = __CLASS__) public static function model($className = __CLASS__)
{ {
...@@ -369,7 +391,7 @@ abstract class CActiveRecord extends CModel ...@@ -369,7 +391,7 @@ abstract class CActiveRecord extends CModel
else else
{ {
$model = self::$_models[$className] = new $className(null); $model = self::$_models[$className] = new $className(null);
$model->_md = new CActiveRecordMetaData($model); $model->_md = new ActiveRecordMetaData($model);
$model->attachBehaviors($model->behaviors()); $model->attachBehaviors($model->behaviors());
return $model; return $model;
} }
...@@ -377,7 +399,7 @@ abstract class CActiveRecord extends CModel ...@@ -377,7 +399,7 @@ abstract class CActiveRecord extends CModel
/** /**
* Returns the meta-data for this AR * Returns the meta-data for this AR
* @return CActiveRecordMetaData the meta for this AR class. * @return ActiveRecordMetaData the meta for this AR class.
*/ */
public function getMetaData() public function getMetaData()
{ {
...@@ -398,7 +420,7 @@ abstract class CActiveRecord extends CModel ...@@ -398,7 +420,7 @@ abstract class CActiveRecord extends CModel
public function refreshMetaData() public function refreshMetaData()
{ {
$finder = self::model(get_class($this)); $finder = self::model(get_class($this));
$finder->_md = new CActiveRecordMetaData($finder); $finder->_md = new ActiveRecordMetaData($finder);
if ($this !== $finder) if ($this !== $finder)
$this->_md = $finder->_md; $this->_md = $finder->_md;
} }
...@@ -587,7 +609,7 @@ abstract class CActiveRecord extends CModel ...@@ -587,7 +609,7 @@ abstract class CActiveRecord extends CModel
{ {
$relations = $model->getMetaData()->relations; $relations = $model->getMetaData()->relations;
if (isset($relations[$seg])) if (isset($relations[$seg]))
$model = CActiveRecord::model($relations[$seg]->className); $model = ActiveRecord::model($relations[$seg]->className);
else else
break; break;
} }
...@@ -708,7 +730,7 @@ abstract class CActiveRecord extends CModel ...@@ -708,7 +730,7 @@ abstract class CActiveRecord extends CModel
{ {
if (!isset($this->_related[$name])) if (!isset($this->_related[$name]))
$this->_related[$name] = array(); $this->_related[$name] = array();
if ($record instanceof CActiveRecord) if ($record instanceof ActiveRecord)
{ {
if ($index === true) if ($index === true)
$this->_related[$name][] = $record; $this->_related[$name][] = $record;
...@@ -1013,7 +1035,7 @@ abstract class CActiveRecord extends CModel ...@@ -1013,7 +1035,7 @@ abstract class CActiveRecord extends CModel
throw new CDbException(Yii::t('yii', 'The active record cannot be inserted to database because it is not new.')); throw new CDbException(Yii::t('yii', 'The active record cannot be inserted to database because it is not new.'));
if ($this->beforeSave()) if ($this->beforeSave())
{ {
Yii::trace(get_class($this) . '.insert()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.insert()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$table = $this->getMetaData()->tableSchema; $table = $this->getMetaData()->tableSchema;
$command = $builder->createInsertCommand($table, $this->getAttributes($attributes)); $command = $builder->createInsertCommand($table, $this->getAttributes($attributes));
...@@ -1061,7 +1083,7 @@ abstract class CActiveRecord extends CModel ...@@ -1061,7 +1083,7 @@ abstract class CActiveRecord extends CModel
throw new CDbException(Yii::t('yii', 'The active record cannot be updated because it is new.')); throw new CDbException(Yii::t('yii', 'The active record cannot be updated because it is new.'));
if ($this->beforeSave()) if ($this->beforeSave())
{ {
Yii::trace(get_class($this) . '.update()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.update()', 'system.db.ar.ActiveRecord');
if ($this->_pk === null) if ($this->_pk === null)
$this->_pk = $this->getPrimaryKey(); $this->_pk = $this->getPrimaryKey();
$this->updateByPk($this->getOldPrimaryKey(), $this->getAttributes($attributes)); $this->updateByPk($this->getOldPrimaryKey(), $this->getAttributes($attributes));
...@@ -1095,7 +1117,7 @@ abstract class CActiveRecord extends CModel ...@@ -1095,7 +1117,7 @@ abstract class CActiveRecord extends CModel
{ {
if (!$this->getIsNewRecord()) if (!$this->getIsNewRecord())
{ {
Yii::trace(get_class($this) . '.saveAttributes()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.saveAttributes()', 'system.db.ar.ActiveRecord');
$values = array(); $values = array();
foreach ($attributes as $name => $value) foreach ($attributes as $name => $value)
{ {
...@@ -1135,7 +1157,7 @@ abstract class CActiveRecord extends CModel ...@@ -1135,7 +1157,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function saveCounters($counters) public function saveCounters($counters)
{ {
Yii::trace(get_class($this) . '.saveCounters()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.saveCounters()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$table = $this->getTableSchema(); $table = $this->getTableSchema();
$criteria = $builder->createPkCriteria($table, $this->getOldPrimaryKey()); $criteria = $builder->createPkCriteria($table, $this->getOldPrimaryKey());
...@@ -1159,7 +1181,7 @@ abstract class CActiveRecord extends CModel ...@@ -1159,7 +1181,7 @@ abstract class CActiveRecord extends CModel
{ {
if (!$this->getIsNewRecord()) if (!$this->getIsNewRecord())
{ {
Yii::trace(get_class($this) . '.delete()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.delete()', 'system.db.ar.ActiveRecord');
if ($this->beforeDelete()) if ($this->beforeDelete())
{ {
$result = $this->deleteByPk($this->getPrimaryKey()) > 0; $result = $this->deleteByPk($this->getPrimaryKey()) > 0;
...@@ -1179,7 +1201,7 @@ abstract class CActiveRecord extends CModel ...@@ -1179,7 +1201,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function refresh() public function refresh()
{ {
Yii::trace(get_class($this) . '.refresh()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.refresh()', 'system.db.ar.ActiveRecord');
if (!$this->getIsNewRecord() && ($record = $this->findByPk($this->getPrimaryKey())) !== null) if (!$this->getIsNewRecord() && ($record = $this->findByPk($this->getPrimaryKey())) !== null)
{ {
$this->_attributes = array(); $this->_attributes = array();
...@@ -1200,7 +1222,7 @@ abstract class CActiveRecord extends CModel ...@@ -1200,7 +1222,7 @@ abstract class CActiveRecord extends CModel
/** /**
* Compares current active record with another one. * Compares current active record with another one.
* The comparison is made by comparing table name and the primary key values of the two active records. * The comparison is made by comparing table name and the primary key values of the two active records.
* @param CActiveRecord $record record to compare to * @param ActiveRecord $record record to compare to
* @return boolean whether the two active records refer to the same row in the database table. * @return boolean whether the two active records refer to the same row in the database table.
*/ */
public function equals($record) public function equals($record)
...@@ -1390,11 +1412,11 @@ abstract class CActiveRecord extends CModel ...@@ -1390,11 +1412,11 @@ abstract class CActiveRecord extends CModel
* @param array $params parameters to be bound to an SQL statement. * @param array $params parameters to be bound to an SQL statement.
* This is only used when the first parameter is a string (query condition). * This is only used when the first parameter is a string (query condition).
* In other cases, please use {@link CDbCriteria::params} to set parameters. * In other cases, please use {@link CDbCriteria::params} to set parameters.
* @return CActiveRecord the record found. Null if no record is found. * @return ActiveRecord the record found. Null if no record is found.
*/ */
public function find($condition = '', $params = array()) public function find($condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.find()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.find()', 'system.db.ar.ActiveRecord');
$criteria = $this->getCommandBuilder()->createCriteria($condition, $params); $criteria = $this->getCommandBuilder()->createCriteria($condition, $params);
return $this->query($criteria); return $this->query($criteria);
} }
...@@ -1408,7 +1430,7 @@ abstract class CActiveRecord extends CModel ...@@ -1408,7 +1430,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function findAll($condition = '', $params = array()) public function findAll($condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.findAll()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findAll()', 'system.db.ar.ActiveRecord');
$criteria = $this->getCommandBuilder()->createCriteria($condition, $params); $criteria = $this->getCommandBuilder()->createCriteria($condition, $params);
return $this->query($criteria, true); return $this->query($criteria, true);
} }
...@@ -1419,11 +1441,11 @@ abstract class CActiveRecord extends CModel ...@@ -1419,11 +1441,11 @@ abstract class CActiveRecord extends CModel
* @param mixed $pk primary key value(s). Use array for multiple primary keys. For composite key, each key value must be an array (column name=>column value). * @param mixed $pk primary key value(s). Use array for multiple primary keys. For composite key, each key value must be an array (column name=>column value).
* @param mixed $condition query condition or criteria. * @param mixed $condition query condition or criteria.
* @param array $params parameters to be bound to an SQL statement. * @param array $params parameters to be bound to an SQL statement.
* @return CActiveRecord the record found. Null if none is found. * @return ActiveRecord the record found. Null if none is found.
*/ */
public function findByPk($pk, $condition = '', $params = array()) public function findByPk($pk, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.findByPk()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findByPk()', 'system.db.ar.ActiveRecord');
$prefix = $this->getTableAlias(true) . '.'; $prefix = $this->getTableAlias(true) . '.';
$criteria = $this->getCommandBuilder()->createPkCriteria($this->getTableSchema(), $pk, $condition, $params, $prefix); $criteria = $this->getCommandBuilder()->createPkCriteria($this->getTableSchema(), $pk, $condition, $params, $prefix);
return $this->query($criteria); return $this->query($criteria);
...@@ -1439,7 +1461,7 @@ abstract class CActiveRecord extends CModel ...@@ -1439,7 +1461,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function findAllByPk($pk, $condition = '', $params = array()) public function findAllByPk($pk, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.findAllByPk()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findAllByPk()', 'system.db.ar.ActiveRecord');
$prefix = $this->getTableAlias(true) . '.'; $prefix = $this->getTableAlias(true) . '.';
$criteria = $this->getCommandBuilder()->createPkCriteria($this->getTableSchema(), $pk, $condition, $params, $prefix); $criteria = $this->getCommandBuilder()->createPkCriteria($this->getTableSchema(), $pk, $condition, $params, $prefix);
return $this->query($criteria, true); return $this->query($criteria, true);
...@@ -1452,11 +1474,11 @@ abstract class CActiveRecord extends CModel ...@@ -1452,11 +1474,11 @@ abstract class CActiveRecord extends CModel
* Since version 1.0.8, an attribute value can be an array which will be used to generate an IN condition. * Since version 1.0.8, an attribute value can be an array which will be used to generate an IN condition.
* @param mixed $condition query condition or criteria. * @param mixed $condition query condition or criteria.
* @param array $params parameters to be bound to an SQL statement. * @param array $params parameters to be bound to an SQL statement.
* @return CActiveRecord the record found. Null if none is found. * @return ActiveRecord the record found. Null if none is found.
*/ */
public function findByAttributes($attributes, $condition = '', $params = array()) public function findByAttributes($attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.findByAttributes()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findByAttributes()', 'system.db.ar.ActiveRecord');
$prefix = $this->getTableAlias(true) . '.'; $prefix = $this->getTableAlias(true) . '.';
$criteria = $this->getCommandBuilder()->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix); $criteria = $this->getCommandBuilder()->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix);
return $this->query($criteria); return $this->query($criteria);
...@@ -1473,7 +1495,7 @@ abstract class CActiveRecord extends CModel ...@@ -1473,7 +1495,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function findAllByAttributes($attributes, $condition = '', $params = array()) public function findAllByAttributes($attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.findAllByAttributes()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findAllByAttributes()', 'system.db.ar.ActiveRecord');
$prefix = $this->getTableAlias(true) . '.'; $prefix = $this->getTableAlias(true) . '.';
$criteria = $this->getCommandBuilder()->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix); $criteria = $this->getCommandBuilder()->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix);
return $this->query($criteria, true); return $this->query($criteria, true);
...@@ -1483,11 +1505,11 @@ abstract class CActiveRecord extends CModel ...@@ -1483,11 +1505,11 @@ abstract class CActiveRecord extends CModel
* Finds a single active record with the specified SQL statement. * Finds a single active record with the specified SQL statement.
* @param string $sql the SQL statement * @param string $sql the SQL statement
* @param array $params parameters to be bound to the SQL statement * @param array $params parameters to be bound to the SQL statement
* @return CActiveRecord the record found. Null if none is found. * @return ActiveRecord the record found. Null if none is found.
*/ */
public function findBySql($sql, $params = array()) public function findBySql($sql, $params = array())
{ {
Yii::trace(get_class($this) . '.findBySql()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findBySql()', 'system.db.ar.ActiveRecord');
$this->beforeFind(); $this->beforeFind();
if (($criteria = $this->getDbCriteria(false)) !== null && !empty($criteria->with)) if (($criteria = $this->getDbCriteria(false)) !== null && !empty($criteria->with))
{ {
...@@ -1510,7 +1532,7 @@ abstract class CActiveRecord extends CModel ...@@ -1510,7 +1532,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function findAllBySql($sql, $params = array()) public function findAllBySql($sql, $params = array())
{ {
Yii::trace(get_class($this) . '.findAllBySql()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.findAllBySql()', 'system.db.ar.ActiveRecord');
$this->beforeFind(); $this->beforeFind();
if (($criteria = $this->getDbCriteria(false)) !== null && !empty($criteria->with)) if (($criteria = $this->getDbCriteria(false)) !== null && !empty($criteria->with))
{ {
...@@ -1534,7 +1556,7 @@ abstract class CActiveRecord extends CModel ...@@ -1534,7 +1556,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function count($condition = '', $params = array()) public function count($condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.count()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.count()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createCriteria($condition, $params); $criteria = $builder->createCriteria($condition, $params);
$this->applyScopes($criteria); $this->applyScopes($criteria);
...@@ -1560,7 +1582,7 @@ abstract class CActiveRecord extends CModel ...@@ -1560,7 +1582,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function countByAttributes($attributes, $condition = '', $params = array()) public function countByAttributes($attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.countByAttributes()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.countByAttributes()', 'system.db.ar.ActiveRecord');
$prefix = $this->getTableAlias(true) . '.'; $prefix = $this->getTableAlias(true) . '.';
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix); $criteria = $builder->createColumnCriteria($this->getTableSchema(), $attributes, $condition, $params, $prefix);
...@@ -1585,7 +1607,7 @@ abstract class CActiveRecord extends CModel ...@@ -1585,7 +1607,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function countBySql($sql, $params = array()) public function countBySql($sql, $params = array())
{ {
Yii::trace(get_class($this) . '.countBySql()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.countBySql()', 'system.db.ar.ActiveRecord');
return $this->getCommandBuilder()->createSqlCommand($sql, $params)->queryScalar(); return $this->getCommandBuilder()->createSqlCommand($sql, $params)->queryScalar();
} }
...@@ -1598,7 +1620,7 @@ abstract class CActiveRecord extends CModel ...@@ -1598,7 +1620,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function exists($condition = '', $params = array()) public function exists($condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.exists()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.exists()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createCriteria($condition, $params); $criteria = $builder->createCriteria($condition, $params);
$table = $this->getTableSchema(); $table = $this->getTableSchema();
...@@ -1644,7 +1666,7 @@ abstract class CActiveRecord extends CModel ...@@ -1644,7 +1666,7 @@ abstract class CActiveRecord extends CModel
* Previously, it was not possible to specify on-th-fly query options, * Previously, it was not possible to specify on-th-fly query options,
* and child-relations were specified as hierarchical arrays. * and child-relations were specified as hierarchical arrays.
* *
* @return CActiveRecord the AR object itself. * @return ActiveRecord the AR object itself.
*/ */
public function with() public function with()
{ {
...@@ -1663,7 +1685,7 @@ abstract class CActiveRecord extends CModel ...@@ -1663,7 +1685,7 @@ abstract class CActiveRecord extends CModel
* Sets {@link CDbCriteria::together} property to be true. * Sets {@link CDbCriteria::together} property to be true.
* This is only used in relational AR query. Please refer to {@link CDbCriteria::together} * This is only used in relational AR query. Please refer to {@link CDbCriteria::together}
* for more details. * for more details.
* @return CActiveRecord the AR object itself * @return ActiveRecord the AR object itself
* @since 1.1.4 * @since 1.1.4
*/ */
public function together() public function together()
...@@ -1684,7 +1706,7 @@ abstract class CActiveRecord extends CModel ...@@ -1684,7 +1706,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function updateByPk($pk, $attributes, $condition = '', $params = array()) public function updateByPk($pk, $attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.updateByPk()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.updateByPk()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$table = $this->getTableSchema(); $table = $this->getTableSchema();
$criteria = $builder->createPkCriteria($table, $pk, $condition, $params); $criteria = $builder->createPkCriteria($table, $pk, $condition, $params);
...@@ -1703,7 +1725,7 @@ abstract class CActiveRecord extends CModel ...@@ -1703,7 +1725,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function updateAll($attributes, $condition = '', $params = array()) public function updateAll($attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.updateAll()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.updateAll()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createCriteria($condition, $params); $criteria = $builder->createCriteria($condition, $params);
$command = $builder->createUpdateCommand($this->getTableSchema(), $attributes, $criteria); $command = $builder->createUpdateCommand($this->getTableSchema(), $attributes, $criteria);
...@@ -1722,7 +1744,7 @@ abstract class CActiveRecord extends CModel ...@@ -1722,7 +1744,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function updateCounters($counters, $condition = '', $params = array()) public function updateCounters($counters, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.updateCounters()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.updateCounters()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createCriteria($condition, $params); $criteria = $builder->createCriteria($condition, $params);
$command = $builder->createUpdateCounterCommand($this->getTableSchema(), $counters, $criteria); $command = $builder->createUpdateCounterCommand($this->getTableSchema(), $counters, $criteria);
...@@ -1739,7 +1761,7 @@ abstract class CActiveRecord extends CModel ...@@ -1739,7 +1761,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function deleteByPk($pk, $condition = '', $params = array()) public function deleteByPk($pk, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.deleteByPk()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.deleteByPk()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createPkCriteria($this->getTableSchema(), $pk, $condition, $params); $criteria = $builder->createPkCriteria($this->getTableSchema(), $pk, $condition, $params);
$command = $builder->createDeleteCommand($this->getTableSchema(), $criteria); $command = $builder->createDeleteCommand($this->getTableSchema(), $criteria);
...@@ -1755,7 +1777,7 @@ abstract class CActiveRecord extends CModel ...@@ -1755,7 +1777,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function deleteAll($condition = '', $params = array()) public function deleteAll($condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.deleteAll()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.deleteAll()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$criteria = $builder->createCriteria($condition, $params); $criteria = $builder->createCriteria($condition, $params);
$command = $builder->createDeleteCommand($this->getTableSchema(), $criteria); $command = $builder->createDeleteCommand($this->getTableSchema(), $criteria);
...@@ -1774,7 +1796,7 @@ abstract class CActiveRecord extends CModel ...@@ -1774,7 +1796,7 @@ abstract class CActiveRecord extends CModel
*/ */
public function deleteAllByAttributes($attributes, $condition = '', $params = array()) public function deleteAllByAttributes($attributes, $condition = '', $params = array())
{ {
Yii::trace(get_class($this) . '.deleteAllByAttributes()', 'system.db.ar.CActiveRecord'); Yii::trace(get_class($this) . '.deleteAllByAttributes()', 'system.db.ar.ActiveRecord');
$builder = $this->getCommandBuilder(); $builder = $this->getCommandBuilder();
$table = $this->getTableSchema(); $table = $this->getTableSchema();
$criteria = $builder->createColumnCriteria($table, $attributes, $condition, $params); $criteria = $builder->createColumnCriteria($table, $attributes, $condition, $params);
...@@ -1788,7 +1810,7 @@ abstract class CActiveRecord extends CModel ...@@ -1788,7 +1810,7 @@ abstract class CActiveRecord extends CModel
* @param array $attributes attribute values (column name=>column value) * @param array $attributes attribute values (column name=>column value)
* @param boolean $callAfterFind whether to call {@link afterFind} after the record is populated. * @param boolean $callAfterFind whether to call {@link afterFind} after the record is populated.
* This parameter is added in version 1.0.3. * This parameter is added in version 1.0.3.
* @return CActiveRecord the newly created active record. The class of the object is the same as the model class. * @return ActiveRecord the newly created active record. The class of the object is the same as the model class.
* Null is returned if the input data is false. * Null is returned if the input data is false.
*/ */
public function populateRecord($attributes, $callAfterFind = true) public function populateRecord($attributes, $callAfterFind = true)
...@@ -1850,7 +1872,7 @@ abstract class CActiveRecord extends CModel ...@@ -1850,7 +1872,7 @@ abstract class CActiveRecord extends CModel
* For example, by creating a record based on the value of a column, * For example, by creating a record based on the value of a column,
* you may implement the so-called single-table inheritance mapping. * you may implement the so-called single-table inheritance mapping.
* @param array $attributes list of attribute values for the active records. * @param array $attributes list of attribute values for the active records.
* @return CActiveRecord the active record * @return ActiveRecord the active record
* @since 1.0.2 * @since 1.0.2
*/ */
protected function instantiate($attributes) protected function instantiate($attributes)
...@@ -1877,7 +1899,7 @@ abstract class CActiveRecord extends CModel ...@@ -1877,7 +1899,7 @@ abstract class CActiveRecord extends CModel
/** /**
* CBaseActiveRelation is the base class for all active relations. * CBaseActiveRelation is the base class for all active relations.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0.4 * @since 1.0.4
*/ */
...@@ -2020,7 +2042,7 @@ class CBaseActiveRelation extends CComponent ...@@ -2020,7 +2042,7 @@ class CBaseActiveRelation extends CComponent
/** /**
* CStatRelation represents a statistical relational query. * CStatRelation represents a statistical relational query.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0.4 * @since 1.0.4
*/ */
...@@ -2058,7 +2080,7 @@ class CStatRelation extends CBaseActiveRelation ...@@ -2058,7 +2080,7 @@ class CStatRelation extends CBaseActiveRelation
/** /**
* CActiveRelation is the base class for representing active relations that bring back related objects. * CActiveRelation is the base class for representing active relations that bring back related objects.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
...@@ -2081,7 +2103,7 @@ class CActiveRelation extends CBaseActiveRelation ...@@ -2081,7 +2103,7 @@ class CActiveRelation extends CBaseActiveRelation
public $alias; public $alias;
/** /**
* @var string|array specifies which related objects should be eagerly loaded when this related object is lazily loaded. * @var string|array specifies which related objects should be eagerly loaded when this related object is lazily loaded.
* For more details about this property, see {@link CActiveRecord::with()}. * For more details about this property, see {@link ActiveRecord::with()}.
*/ */
public $with = array(); public $with = array();
/** /**
...@@ -2155,7 +2177,7 @@ class CActiveRelation extends CBaseActiveRelation ...@@ -2155,7 +2177,7 @@ class CActiveRelation extends CBaseActiveRelation
/** /**
* CBelongsToRelation represents the parameters specifying a BELONGS_TO relation. * CBelongsToRelation represents the parameters specifying a BELONGS_TO relation.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
...@@ -2167,7 +2189,7 @@ class CBelongsToRelation extends CActiveRelation ...@@ -2167,7 +2189,7 @@ class CBelongsToRelation extends CActiveRelation
/** /**
* CHasOneRelation represents the parameters specifying a HAS_ONE relation. * CHasOneRelation represents the parameters specifying a HAS_ONE relation.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
...@@ -2185,7 +2207,7 @@ class CHasOneRelation extends CActiveRelation ...@@ -2185,7 +2207,7 @@ class CHasOneRelation extends CActiveRelation
/** /**
* CHasManyRelation represents the parameters specifying a HAS_MANY relation. * CHasManyRelation represents the parameters specifying a HAS_MANY relation.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
...@@ -2238,7 +2260,7 @@ class CHasManyRelation extends CActiveRelation ...@@ -2238,7 +2260,7 @@ class CHasManyRelation extends CActiveRelation
/** /**
* CManyManyRelation represents the parameters specifying a MANY_MANY relation. * CManyManyRelation represents the parameters specifying a MANY_MANY relation.
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
...@@ -2248,14 +2270,14 @@ class CManyManyRelation extends CHasManyRelation ...@@ -2248,14 +2270,14 @@ class CManyManyRelation extends CHasManyRelation
/** /**
* CActiveRecordMetaData represents the meta-data for an Active Record class. * ActiveRecordMetaData represents the meta-data for an Active Record class.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 1.0
*/ */
class CActiveRecordMetaData class ActiveRecordMetaData
{ {
/** /**
* @var CDbTableSchema the table schema information * @var CDbTableSchema the table schema information
...@@ -2278,7 +2300,7 @@ class CActiveRecordMetaData ...@@ -2278,7 +2300,7 @@ class CActiveRecordMetaData
/** /**
* Constructor. * Constructor.
* @param CActiveRecord $model the model instance * @param ActiveRecord $model the model instance
*/ */
public function __construct($model) public function __construct($model)
{ {
......
framework/db/pdo/Connection.php → framework/db/dao/Connection.php
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
namespace yii\db\dao;
/** /**
* Connection represents a connection to a database. * Connection represents a connection to a database.
* *
......
todo.txt
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* application * application
* http exception * http exception
- validators - validators
* type conversion rules
* CompareValidator::clientValidateAttribute(): search for "CHtml::activeId" * CompareValidator::clientValidateAttribute(): search for "CHtml::activeId"
* FileValidator, UniqueValidator, ExistValidator, DateValidator: TBD * FileValidator, UniqueValidator, ExistValidator, DateValidator: TBD
* consider merging UniqueValidator and ExistValidator and using a NOT property. * consider merging UniqueValidator and ExistValidator and using a NOT property.
......
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