Prepare values in hash condition (#423)

Author: vjik

tests/ArrayExpressionBuilderTest.php

@@ -104,14 +104,14 @@ 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"=:qp0)',
-                [':qp0' => 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"=:qp0)::integer[]]::integer[][]',
-                [':qp0' => 1],
+                'ARRAY[ARRAY(SELECT "id" FROM "users" WHERE "active"=1)::integer[]]::integer[][]',
+                [],
             ],
             'bool' => [
                 [[[true], [false, null]], [['t', 'f'], null], null],

tests/Provider/QueryBuilderProvider.php

@@ -195,14 +195,13 @@ 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"=:qp4) 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',
-                    ':qp1' => 'test@example.com',
-                    ':qp2' => 'sergeymakinen',
-                    ':qp3' => '{{city}}',
-                    ':qp4' => false,
+                    ':qp1' => new Param('test@example.com', DataType::STRING),
+                    ':qp2' => new Param('sergeymakinen', DataType::STRING),
+                    ':qp3' => new Param('{{city}}', DataType::STRING),
                     ':phFoo' => 'foo',
                 ],
             ],

tests/StructuredExpressionBuilderTest.php

@@ -79,14 +79,14 @@ 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"=:qp0)',
-                [':qp0' => 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"=:qp0)::currency_money',
-                [':qp0' => 1],
+                '(SELECT "price" FROM "product" WHERE "id"=1)::currency_money',
+                [],
             ],
             'ordered array' => [
                 ['value' => '5', 'currency_code' => 'USD'],