Merge pull request #16649 from cakephp/datbase-query-tests

Don't use the ORM for Database/Query tests.
cakephp · Jul 27, 2022 · da7c5ed · da7c5ed
2 parents 35b1b52 + d0fa103
commit da7c5ed
Show file tree

Hide file tree

Showing 4 changed files with 328 additions and 217 deletions.
diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -3572,10 +3572,9 @@ public function testTupleComparisonValuesAreBeingBoundCorrectly(): void
             'This test fails sporadically in SQLServer'
         );
 
-        $profiles = $this->getTableLocator()->get('Profiles');
-
-        $query = $profiles
-            ->find()
+        $query = (new Query($this->connection))
+            ->select('*')
+            ->from('profiles')
             ->where(
                 new TupleComparison(
                     ['id', 'user_id'],
@@ -3585,7 +3584,7 @@ public function testTupleComparisonValuesAreBeingBoundCorrectly(): void
                 )
             );
 
-        $result = $query->firstOrFail();
+        $result = $query->execute()->fetch(StatementInterface::FETCH_TYPE_ASSOC);
 
         $bindings = array_values($query->getValueBinder()->bindings());
         $this->assertCount(2, $bindings);
@@ -3594,8 +3593,8 @@ public function testTupleComparisonValuesAreBeingBoundCorrectly(): void
         $this->assertSame(1, $bindings[1]['value']);
         $this->assertSame('integer', $bindings[1]['type']);
 
-        $this->assertSame(1, $result['id']);
-        $this->assertSame(1, $result['user_id']);
+        $this->assertSame(1, (int)$result['id']);
+        $this->assertSame(1, (int)$result['user_id']);
     }
 
     /**
@@ -3613,10 +3612,9 @@ public function testTupleComparisonTypesCanBeOmitted(): void
             'This test fails sporadically in SQLServer'
         );
 
-        $profiles = $this->getTableLocator()->get('Profiles');
-
-        $query = $profiles
-            ->find()
+        $query = (new Query($this->connection))
+            ->select('*')
+            ->from('profiles')
             ->where(
                 new TupleComparison(
                     ['id', 'user_id'],
@@ -3625,7 +3623,7 @@ public function testTupleComparisonTypesCanBeOmitted(): void
                     'IN'
                 )
             );
-        $result = $query->firstOrFail();
+        $result = $query->execute()->fetch(StatementInterface::FETCH_TYPE_ASSOC);
 
         $bindings = array_values($query->getValueBinder()->bindings());
         $this->assertCount(2, $bindings);
@@ -3634,8 +3632,8 @@ public function testTupleComparisonTypesCanBeOmitted(): void
         $this->assertSame(1, $bindings[1]['value']);
         $this->assertNull($bindings[1]['type']);
 
-        $this->assertSame(1, $result['id']);
-        $this->assertSame(1, $result['user_id']);
+        $this->assertSame(1, (int)$result['id']);
+        $this->assertSame(1, (int)$result['user_id']);
     }
 
     /**