diff --git a/Base/Model.php b/Base/Model.php index 678d21d..770f2ef 100644 --- a/Base/Model.php +++ b/Base/Model.php @@ -253,7 +253,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \ return NULL; } $query = new ActiveQuery($model = static::instance()); - $query->from($model->getTable())->alias('t1'); + $query->from($model->getTable()); if (is_numeric($param)) { $query->where([$model->getPrimary() => +$param]); } else if (is_array($param)) { @@ -279,7 +279,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \ { $model = static::instance(); $query = new ActiveQuery($model); - $query->from($model->getTable())->alias('t1')->where([$model->getPrimary() => $param]); + $query->from($model->getTable())->where([$model->getPrimary() => $param]); return $query->first(); } @@ -324,7 +324,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \ public static function all(string|array $condition): Collection { $model = new ActiveQuery(static::instance()); - $model->from($model->getTable())->alias('t1'); + $model->from($model->getTable()); if (is_array($condition)) { $model->where($condition); } else { @@ -341,7 +341,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \ public static function query(): ActiveQuery { $model = new ActiveQuery(static::instance()); - $model->select()->from($model->getTable())->alias('t1'); + $model->select()->from($model->getTable()); return $model; } diff --git a/Traits/QueryTrait.php b/Traits/QueryTrait.php index 201bfeb..036bbeb 100644 --- a/Traits/QueryTrait.php +++ b/Traits/QueryTrait.php @@ -32,7 +32,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq return $this->where; } } - public array $select = ['t1.*'] { + public array $select = ['*'] { &get { return $this->select; }