Skip to content

Adapt tests to changes in Yii DB #429

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
vjik merged 4 commits into from
Jul 30, 2025
Merged

Adapt tests to changes in Yii DB #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8006154
Adapt tests to changes in Yii DB
vjik Jul 29, 2025
65a0ea5
fix
vjik Jul 29, 2025
3763114
fix
vjik Jul 29, 2025
86f4e83
fix
vjik Jul 29, 2025
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
4 changes: 2 additions & 2 deletions tests/ArrayExpressionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ public static function buildProvider(): array
'Query w/o type' => [
(new Query(self::getDb()))->select('id')->from('users')->where(['active' => 1]),
null,
'ARRAY(SELECT "id" FROM "users" WHERE "active"=1)',
'ARRAY(SELECT "id" FROM "users" WHERE "active" = 1)',
[],
],
'Query' => [
[(new Query(self::getDb()))->select('id')->from('users')->where(['active' => 1])],
'integer[][]',
'ARRAY[ARRAY(SELECT "id" FROM "users" WHERE "active"=1)::integer[]]::integer[][]',
'ARRAY[ARRAY(SELECT "id" FROM "users" WHERE "active" = 1)::integer[]]::integer[][]',
[],
],
'bool' => [
Expand Down
12 changes: 6 additions & 6 deletions tests/Provider/QueryBuilderProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public static function insertReturningPks(): array
),
[':phBar' => 'bar'],
<<<SQL
INSERT INTO "customer" ("email", "name", "address", "is_active", "related_id") SELECT "email", "name", "address", "is_active", "related_id" FROM "customer" WHERE ("email"=:qp1) AND ("name"=:qp2) AND ("address"=:qp3) AND ("is_active"=FALSE) AND ("related_id" IS NULL) AND ("col"=CONCAT(:phFoo, :phBar)) RETURNING "id"
INSERT INTO "customer" ("email", "name", "address", "is_active", "related_id") SELECT "email", "name", "address", "is_active", "related_id" FROM "customer" WHERE ("email" = :qp1) AND ("name" = :qp2) AND ("address" = :qp3) AND ("is_active" = FALSE) AND ("related_id" IS NULL) AND ("col" = CONCAT(:phFoo, :phBar)) RETURNING "id"
SQL,
[
':phBar' => 'bar',
Expand Down Expand Up @@ -242,16 +242,16 @@ public static function upsert(): array
],
'query' => [
3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "status"=EXCLUDED."status"',
'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "status"=EXCLUDED."status"',
],
'query with update part' => [
2 => ['address' => 'foo {{city}}', 'status' => 2, 'orders' => new Expression('"T_upsert"."orders" + 1')],
3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "address"=:qp1, "status"=:qp2, "orders"="T_upsert"."orders" + 1',
'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "address"=:qp1, "status"=:qp2, "orders"="T_upsert"."orders" + 1',
],
'query without update part' => [
3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT DO NOTHING',
'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT DO NOTHING',
],
'values and expressions' => [
1 => ['{{%T_upsert}}.[[email]]' => 'dynamic@example.com', '[[ts]]' => new Expression('extract(epoch from now()) * 1000')],
Expand Down Expand Up @@ -532,8 +532,8 @@ public static function caseExpressionBuilder(): array
[':pv2' => $paramB = new Param('b', DataType::STRING)],
)),
),
'CASE WHEN "column_name" = :qp0 THEN :qp1 WHEN "column_name" = 2 THEN (SELECT :pv2::text) END',
[':qp0' => 1, ':qp1' => $paramA, ':pv2' => $paramB],
'CASE WHEN "column_name" = 1 THEN :qp0 WHEN "column_name" = 2 THEN (SELECT :pv2::text) END',
[':qp0' => $paramA, ':pv2' => $paramB],
'b',
];
}
Expand Down
4 changes: 2 additions & 2 deletions tests/StructuredExpressionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ public static function buildProvider(): array
'Query w/o type' => [
(new Query(self::getDb()))->select('price')->from('product')->where(['id' => 1]),
null,
'(SELECT "price" FROM "product" WHERE "id"=1)',
'(SELECT "price" FROM "product" WHERE "id" = 1)',
[],
],
'Query' => [
(new Query(self::getDb()))->select('price')->from('product')->where(['id' => 1]),
'currency_money',
'(SELECT "price" FROM "product" WHERE "id"=1)::currency_money',
'(SELECT "price" FROM "product" WHERE "id" = 1)::currency_money',
[],
],
'ordered array' => [
Expand Down