Fix tests

yiisoft · Aug 29, 2024 · 5688929 · 5688929
1 parent 6a305d4
commit 5688929
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/tests/ActiveQueryTest.php b/tests/ActiveQueryTest.php
@@ -2045,9 +2045,7 @@ public function testOptimisticLockAfterDelete(): void
         $document->delete();
     }
 
-    /**
-     * {@see https://github.com/yiisoft/yii2/issues/9006}
-     */
+    /** @link https://github.com/yiisoft/yii2/issues/9006 */
     public function testBit(): void
     {
         $this->checkFixture($this->db(), 'bit_values');

diff --git a/tests/Driver/Oracle/ActiveQueryTest.php b/tests/Driver/Oracle/ActiveQueryTest.php
@@ -389,19 +389,16 @@ public function testJoinWithSameTable(): void
         $this->assertTrue($orders[0]->isRelationPopulated('itemsIndexed'));
     }
 
-    /**
-     * @see https://github.com/yiisoft/yii2/issues/9006
-     */
     public function testBit(): void
     {
         $this->checkFixture($this->db(), 'bit_values');
 
         $bitValueQuery = new ActiveQuery(BitValues::class);
         $falseBit = $bitValueQuery->findOne(1);
-        $this->assertEquals('0', $falseBit->val);
+        $this->assertSame('0', $falseBit->val);
 
         $bitValueQuery = new ActiveQuery(BitValues::class);
         $trueBit = $bitValueQuery->findOne(2);
-        $this->assertEquals('1', $trueBit->val);
+        $this->assertSame('1', $trueBit->val);
     }
 }
diff --git a/tests/Driver/Pgsql/ActiveQueryTest.php b/tests/Driver/Pgsql/ActiveQueryTest.php
@@ -4,6 +4,8 @@
 
 namespace Yiisoft\ActiveRecord\Tests\Driver\Pgsql;
 
+use Yiisoft\ActiveRecord\ActiveQuery;
+use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\BitValues;
 use Yiisoft\ActiveRecord\Tests\Support\PgsqlHelper;
 use Yiisoft\Db\Connection\ConnectionInterface;
 
@@ -13,4 +15,17 @@ protected function createConnection(): ConnectionInterface
     {
         return (new PgsqlHelper())->createConnection();
     }
+
+    public function testBit(): void
+    {
+        $this->checkFixture($this->db(), 'bit_values');
+
+        $bitValueQuery = new ActiveQuery(BitValues::class);
+        $falseBit = $bitValueQuery->findOne(1);
+        $this->assertSame(0, $falseBit->val);
+
+        $bitValueQuery = new ActiveQuery(BitValues::class);
+        $trueBit = $bitValueQuery->findOne(2);
+        $this->assertSame(1, $trueBit->val);
+    }
 }
diff --git a/tests/data/mysql.sql b/tests/data/mysql.sql
@@ -157,8 +157,8 @@ CREATE TABLE `type` (
   `blob_col` blob,
   `numeric_col` decimal(5,2) DEFAULT '33.22',
   `time` timestamp NOT NULL DEFAULT '2002-01-01 00:00:00',
-  `bool_col` tinyint(1) NOT NULL,
-  `bool_col2` tinyint(1) DEFAULT '1',
+  `bool_col` bit(1) NOT NULL,
+  `bool_col2` bit(1) DEFAULT b'1',
   `ts_default` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `bit_col` BIT(8) NOT NULL DEFAULT b'10000010',
   `json_col` json