Update tests.

yiisoft · Oct 25, 2023 · 7e6b94e · 7e6b94e
1 parent 0ce3b21
commit 7e6b94e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/tests/Provider/CommandProvider.php b/tests/Provider/CommandProvider.php
@@ -22,14 +22,14 @@ public static function batchInsert(): array
     {
         $batchInsert = parent::batchInsert();
 
-        $batchInsert['multirow']['expectedParams'][':qp3'] = 1;
-        $batchInsert['multirow']['expectedParams'][':qp7'] = 0;
+        $batchInsert['multirow']['expectedParams'][':qp3'] = true;
+        $batchInsert['multirow']['expectedParams'][':qp7'] = false;
 
-        $batchInsert['issue11242']['expectedParams'][':qp3'] = 1;
+        $batchInsert['issue11242']['expectedParams'][':qp3'] = true;
 
-        $batchInsert['wrongBehavior']['expectedParams'][':qp3'] = 0;
+        $batchInsert['wrongBehavior']['expectedParams'][':qp3'] = false;
 
-        $batchInsert['batchInsert binds params from expression']['expectedParams'][':qp3'] = 0;
+        $batchInsert['batchInsert binds params from expression']['expectedParams'][':qp3'] = false;
 
         return $batchInsert;
     }

diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
@@ -128,7 +128,7 @@ public static function insertWithReturningPks(): array
                 ['{{%type}}.[[related_id]]' => null, '[[time]]' => new Expression('now()')],
                 [],
                 <<<SQL
-                SET NOCOUNT ON;DECLARE @temporary_inserted TABLE ([int_col] int , [int_col2] int NULL, [tinyint_col] tinyint NULL, [smallint_col] smallint NULL, [char_col] char(100) , [char_col2] varchar(100) NULL, [char_col3] text NULL, [float_col] decimal(4,3) , [float_col2] float NULL, [blob_col] varbinary(MAX) NULL, [numeric_col] decimal(5,2) NULL, [datetime_col] datetime , [bool_col] tinyint , [bool_col2] tinyint NULL);INSERT INTO {{%type}} ([related_id], [time]) OUTPUT INSERTED.[int_col],INSERTED.[int_col2],INSERTED.[tinyint_col],INSERTED.[smallint_col],INSERTED.[char_col],INSERTED.[char_col2],INSERTED.[char_col3],INSERTED.[float_col],INSERTED.[float_col2],INSERTED.[blob_col],INSERTED.[numeric_col],INSERTED.[datetime_col],INSERTED.[bool_col],INSERTED.[bool_col2] INTO @temporary_inserted VALUES (:qp0, now());SELECT * FROM @temporary_inserted;
+                SET NOCOUNT ON;DECLARE @temporary_inserted TABLE ([int_col] int , [int_col2] int NULL, [tinyint_col] tinyint NULL, [smallint_col] smallint NULL, [char_col] char(100) , [char_col2] varchar(100) NULL, [char_col3] text NULL, [float_col] decimal(4,3) , [float_col2] float NULL, [blob_col] varbinary(MAX) NULL, [numeric_col] decimal(5,2) NULL, [datetime_col] datetime , [bool_col] bit , [bool_col2] bit NULL);INSERT INTO {{%type}} ([related_id], [time]) OUTPUT INSERTED.[int_col],INSERTED.[int_col2],INSERTED.[tinyint_col],INSERTED.[smallint_col],INSERTED.[char_col],INSERTED.[char_col2],INSERTED.[char_col3],INSERTED.[float_col],INSERTED.[float_col2],INSERTED.[blob_col],INSERTED.[numeric_col],INSERTED.[datetime_col],INSERTED.[bool_col],INSERTED.[bool_col2] INTO @temporary_inserted VALUES (:qp0, now());SELECT * FROM @temporary_inserted;
                 SQL,
                 [':qp0' => null],
             ],

diff --git a/tests/Provider/SchemaProvider.php b/tests/Provider/SchemaProvider.php
@@ -171,9 +171,9 @@ public static function columns(): array
                         'defaultValue' => '2002-01-01 00:00:00',
                     ],
                     'bool_col' => [
-                        'type' => 'tinyint',
-                        'dbType' => 'tinyint',
-                        'phpType' => 'integer',
+                        'type' => 'boolean',
+                        'dbType' => 'bit',
+                        'phpType' => 'boolean',
                         'primaryKey' => false,
                         'allowNull' => false,
                         'autoIncrement' => false,
@@ -184,17 +184,17 @@ public static function columns(): array
                         'defaultValue' => null,
                     ],
                     'bool_col2' => [
-                        'type' => 'tinyint',
-                        'dbType' => 'tinyint',
-                        'phpType' => 'integer',
+                        'type' => 'boolean',
+                        'dbType' => 'bit',
+                        'phpType' => 'boolean',
                         'primaryKey' => false,
                         'allowNull' => true,
                         'autoIncrement' => false,
                         'enumValues' => [],
                         'size' => null,
                         'precision' => null,
                         'scale' => null,
-                        'defaultValue' => 1,
+                        'defaultValue' => true,
                     ],
                 ],
                 'tableName' => 'type',

diff --git a/tests/Provider/Type/BitProvider.php b/tests/Provider/Type/BitProvider.php
@@ -9,9 +9,9 @@ final class BitProvider
     public static function columns(): array
     {
         return [
-            ['Mybit1', 'bit', 'integer', 0],
-            ['Mybit2', 'bit', 'integer', 1],
-            ['Mybit3', 'bit', 'integer', 2],
+            ['Mybit1', 'bit', 'boolean', false],
+            ['Mybit2', 'bit', 'boolean', true],
+            ['Mybit3', 'bit', 'boolean', true],
         ];
     }
 }
diff --git a/tests/Type/BitTest.php b/tests/Type/BitTest.php
@@ -37,7 +37,7 @@ public function testCreateTableWithDefaultValue(
         string $column,
         string $dbType,
         string $phpType,
-        int $defaultValue
+        bool $defaultValue
     ): void {
         $db = $this->buildTable();
 
@@ -89,7 +89,7 @@ public function testDefaultValue(
         string $column,
         string $dbType,
         string $phpType,
-        int $defaultValue
+        bool $defaultValue
     ): void {
         $this->setFixture('Type/bit.sql');
 
@@ -198,7 +198,7 @@ public function testMaxValue(): void
         $this->assertSame(
             [
                 'id' => '2',
-                'Mybit1' => '0',
+                'Mybit1' => '1',
                 'Mybit2' => '1',
                 'Mybit3' => '1',
             ],
@@ -251,7 +251,7 @@ public function testMinValue(): void
             [
                 'id' => '2',
                 'Mybit1' => null,
-                'Mybit2' => '0',
+                'Mybit2' => '1',
                 'Mybit3' => '1',
             ],
             $command->setSql(