Skip to content

Add tests for query() and createQuery() #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tigrov merged 1 commit into from
May 3, 2026
+52 −17
Merged

Add tests for query() and createQuery() #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions tests/ActiveQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Yiisoft\ActiveRecord\ActiveQuery;
use Yiisoft\ActiveRecord\ActiveQueryInterface;
use Yiisoft\ActiveRecord\Internal\ArArrayHelper;
use Yiisoft\ActiveRecord\JoinWith;
use Yiisoft\ActiveRecord\OptimisticLockException;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\BitValues;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\Category;
Expand All @@ -31,7 +30,6 @@
use Yiisoft\ActiveRecord\Tests\Support\Assert;
use Yiisoft\ActiveRecord\Tests\Support\DbHelper;
use Yiisoft\Db\Command\AbstractCommand;
use Yiisoft\Db\Exception\Exception;
use Yiisoft\Db\Exception\InvalidCallException;
use Yiisoft\Db\Exception\InvalidConfigException;
use Yiisoft\Db\Expression\Expression;
Expand Down Expand Up @@ -2526,21 +2524,6 @@ public function testEqual(): void
$this->assertFalse($customerA->equals($customerB));
}

public function testArClassAsString(): void
{
$query = Customer::query();

$this->assertInstanceOf(Customer::class, $query->getModel());
}

public function testArClassAsInstance(): void
{
$customer = new Customer();
$query = $customer->createQuery();

$this->assertInstanceOf(Customer::class, $query->getModel());
}

public function testGetPrimaryModelOnNonRelationQuery(): void
{
$customerQuery = Customer::query();
Expand Down
52 changes: 52 additions & 0 deletions tests/ActiveRecordTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\Cat;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\CategoryAfterDelete;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\Customer;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\CustomerQuery;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\CustomerWithAlias;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\CustomerWithCustomConnection;
use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\CustomerWithFactory;
Expand Down Expand Up @@ -1893,5 +1894,56 @@ public function testSoftDeleteWithCustomDate(): void
$this->assertSame($deletedAt->getTimestamp(), $softDeletedOrder->get('deleted_at'));
}

public function testQuery(): void
{
$query = Customer::query();

$this->assertSame(CustomerQuery::class, $query::class);
$this->assertSame(Customer::class, $query->getModel()::class);
}

public function testQueryWithStringClassName(): void
{
$query = Customer::query(Order::class);

$this->assertSame(CustomerQuery::class, $query::class);
$this->assertSame(Order::class, $query->getModel()::class);
}

public function testQueryWithModelInstance(): void
{
$query = Customer::query(new Order());

$this->assertSame(CustomerQuery::class, $query::class);
$this->assertSame(Order::class, $query->getModel()::class);
}

public function testCreateQuery(): void
{
$order = new Order();
$query = $order->createQuery();

$this->assertSame(ActiveQuery::class, $query::class);
$this->assertSame(Order::class, $query->getModel()::class);
}

public function testCreateQueryWithStringClassName(): void
{
$order = new Order();
$query = $order->createQuery(Customer::class);

$this->assertSame(CustomerQuery::class, $query::class);
$this->assertSame(Customer::class, $query->getModel()::class);
}

public function testCreateQueryWithModelInstance(): void
{
$order = new Order();
$query = $order->createQuery(new Customer());

$this->assertSame(CustomerQuery::class, $query::class);
$this->assertSame(Customer::class, $query->getModel()::class);
}

abstract protected function createFactory(): Factory;
}
Loading