framework/yii/db · c8c7f59d69aa9f499a7cfb998dffdac5ef253956 · PSDI Army / yii2

Merge branch 'master' into db-traits · c8c7f59d

authored Nov 13, 2013

Updated AR classes with the latest changes from master to go on with
separation of AR query classes in traits.

Conflicts:
	framework/yii/db/ActiveQuery.php
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php

c8c7f59d

Name	Last commit	Last update
..
cubrid		Loading commit data...
mssql		Loading commit data...
mysql		Loading commit data...
pgsql		Loading commit data...
sqlite		Loading commit data...
ActiveQuery.php		Loading commit data...
ActiveRecord.php		Loading commit data...
ActiveRelation.php		Loading commit data...
ColumnSchema.php		Loading commit data...
Command.php		Loading commit data...
Connection.php		Loading commit data...
DataReader.php		Loading commit data...
Exception.php		Loading commit data...
Expression.php		Loading commit data...
Migration.php		Loading commit data...
Query.php		Loading commit data...
QueryBuilder.php		Loading commit data...
QueryTrait.php		Loading commit data...
Schema.php		Loading commit data...
StaleObjectException.php		Loading commit data...
TableSchema.php		Loading commit data...
Transaction.php		Loading commit data...