|
|
|
@ -98,7 +98,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
|
|
|
|
|
*/ |
|
|
|
|
public static function findOne($condition) |
|
|
|
|
{ |
|
|
|
|
return static::findByCondition($condition, true); |
|
|
|
|
return static::findByCondition($condition)->one(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -107,19 +107,18 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
|
|
|
|
|
*/ |
|
|
|
|
public static function findAll($condition) |
|
|
|
|
{ |
|
|
|
|
return static::findByCondition($condition, false); |
|
|
|
|
return static::findByCondition($condition)->all(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Finds ActiveRecord instance(s) by the given condition. |
|
|
|
|
* This method is internally called by [[findOne()]] and [[findAll()]]. |
|
|
|
|
* @param mixed $condition please refer to [[findOne()]] for the explanation of this parameter |
|
|
|
|
* @param boolean $one whether this method is called by [[findOne()]] or [[findAll()]] |
|
|
|
|
* @return static|static[] |
|
|
|
|
* @return ActiveQueryInterface the newly created [[ActiveQueryInterface|ActiveQuery]] instance. |
|
|
|
|
* @throws InvalidConfigException if there is no primary key defined |
|
|
|
|
* @internal |
|
|
|
|
*/ |
|
|
|
|
protected static function findByCondition($condition, $one) |
|
|
|
|
protected static function findByCondition($condition) |
|
|
|
|
{ |
|
|
|
|
$query = static::find(); |
|
|
|
|
|
|
|
|
@ -133,7 +132,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $one ? $query->andWhere($condition)->one() : $query->andWhere($condition)->all(); |
|
|
|
|
return $query->andWhere($condition); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|