mirror of
https://github.com/yiisoft/yii2.git
synced 2025-08-22 19:31:02 +08:00
renamed AR trait classes
This commit is contained in:
@ -42,7 +42,7 @@ use yii\db\ActiveRecord;
|
|||||||
* @author Carsten Brandt <mail@cebe.cc>
|
* @author Carsten Brandt <mail@cebe.cc>
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
*/
|
*/
|
||||||
trait ActiveQuery
|
trait ActiveQueryTrait
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var string the name of the ActiveRecord class.
|
* @var string the name of the ActiveRecord class.
|
@ -25,7 +25,7 @@ use yii\db\ActiveRecord;
|
|||||||
* @author Qiang Xue <qiang.xue@gmail.com>
|
* @author Qiang Xue <qiang.xue@gmail.com>
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
*/
|
*/
|
||||||
trait ActiveRelation
|
trait ActiveRelationTrait
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var boolean whether this relation should populate all query results into AR instances.
|
* @var boolean whether this relation should populate all query results into AR instances.
|
@ -46,7 +46,7 @@ namespace yii\db;
|
|||||||
*/
|
*/
|
||||||
class ActiveQuery extends Query
|
class ActiveQuery extends Query
|
||||||
{
|
{
|
||||||
use \yii\ar\ActiveQuery;
|
use \yii\ar\ActiveQueryTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string the SQL statement to be executed for retrieving AR records.
|
* @var string the SQL statement to be executed for retrieving AR records.
|
||||||
|
@ -28,7 +28,7 @@ namespace yii\db;
|
|||||||
*/
|
*/
|
||||||
class ActiveRelation extends ActiveQuery
|
class ActiveRelation extends ActiveQuery
|
||||||
{
|
{
|
||||||
use \yii\ar\ActiveRelation;
|
use \yii\ar\ActiveRelationTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies the pivot table.
|
* Specifies the pivot table.
|
||||||
|
@ -37,7 +37,7 @@ use yii\base\Component;
|
|||||||
*/
|
*/
|
||||||
class Query extends Component
|
class Query extends Component
|
||||||
{
|
{
|
||||||
use BaseQuery;
|
use QueryTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sort ascending
|
* Sort ascending
|
||||||
|
@ -33,7 +33,7 @@ const SORT_DESC = true;
|
|||||||
* @author Carsten Brandt <mail@cebe.cc>
|
* @author Carsten Brandt <mail@cebe.cc>
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
*/
|
*/
|
||||||
trait BaseQuery
|
trait QueryTrait
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var string|array query condition. This refers to the WHERE clause in a SQL statement.
|
* @var string|array query condition. This refers to the WHERE clause in a SQL statement.
|
Reference in New Issue
Block a user