(test): Update tests to use Plan instead of BuildResult

Author: abnegate

tests/Integration/IntegrationTestCase.php

@@ -4,7 +4,7 @@
 
 use PDO;
 use PHPUnit\Framework\TestCase;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 
 abstract class IntegrationTestCase extends TestCase
 {
@@ -77,7 +77,7 @@ protected function connectMongoDB(): MongoDBClient
     /**
      * @return list<array<string, mixed>>
      */
-    protected function executeOnMongoDB(BuildResult $result): array
+    protected function executeOnMongoDB(Plan $result): array
     {
         $mongo = $this->connectMongoDB();
 
@@ -92,7 +92,7 @@ protected function trackMongoCollection(string $collection): void
     /**
      * @return list<array<string, mixed>>
      */
-    protected function executeOnMysql(BuildResult $result): array
+    protected function executeOnMysql(Plan $result): array
     {
         $pdo = $this->connectMysql();
         $stmt = $pdo->prepare($result->query);
@@ -115,7 +115,7 @@ protected function executeOnMysql(BuildResult $result): array
     /**
      * @return list<array<string, mixed>>
      */
-    protected function executeOnPostgres(BuildResult $result): array
+    protected function executeOnPostgres(Plan $result): array
     {
         $pdo = $this->connectPostgres();
         $stmt = $pdo->prepare($result->query);
@@ -138,7 +138,7 @@ protected function executeOnPostgres(BuildResult $result): array
     /**
      * @return list<array<string, mixed>>
      */
-    protected function executeOnClickhouse(BuildResult $result): array
+    protected function executeOnClickhouse(Plan $result): array
     {
         $ch = $this->connectClickhouse();
 

tests/Query/AssertsBindingCount.php

@@ -2,11 +2,11 @@
 
 namespace Tests\Query;
 
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 
 trait AssertsBindingCount
 {
-    protected function assertBindingCount(BuildResult $result): void
+    protected function assertBindingCount(Plan $result): void
     {
         $placeholders = $this->countPlaceholders($result->query);
         $this->assertSame(

tests/Query/Builder/ClickHouseTest.php

@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Tests\Query\AssertsBindingCount;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 use Utopia\Query\Builder\Case\Builder as CaseBuilder;
 use Utopia\Query\Builder\ClickHouse as Builder;
 use Utopia\Query\Builder\Condition;
@@ -9248,7 +9248,7 @@ public function testAfterBuildCallback(): void
         $result = (new Builder())
             ->from('events')
             ->filter([Query::equal('status', ['active'])])
-            ->afterBuild(function (BuildResult $r) use (&$capturedQuery) {
+            ->afterBuild(function (Plan $r) use (&$capturedQuery) {
                 $capturedQuery = 'callback_executed';
                 return $r;
             })

tests/Query/Builder/MariaDBTest.php

@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Tests\Query\AssertsBindingCount;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 use Utopia\Query\Builder\Feature\ConditionalAggregates;
 use Utopia\Query\Builder\Feature\Hints;
 use Utopia\Query\Builder\Feature\Json;
@@ -1004,7 +1004,7 @@ public function testAfterBuildCallback(): void
         $result = (new Builder())
             ->from('users')
             ->filter([Query::equal('status', ['active'])])
-            ->afterBuild(function (BuildResult $r) use (&$capturedQuery) {
+            ->afterBuild(function (Plan $r) use (&$capturedQuery) {
                 $capturedQuery = 'executed';
                 return $r;
             })

tests/Query/Builder/MongoDBTest.php

@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Tests\Query\AssertsBindingCount;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 use Utopia\Query\Builder\Feature\Aggregates;
 use Utopia\Query\Builder\Feature\CTEs;
 use Utopia\Query\Builder\Feature\Deletes;
@@ -2483,12 +2483,12 @@ public function testAfterBuildCallbackModifyingResult(): void
         $result = (new Builder())
             ->from('users')
             ->select(['name'])
-            ->afterBuild(function (BuildResult $result) {
+            ->afterBuild(function (Plan $result) {
                 /** @var array<string, mixed> $op */
                 $op = \json_decode($result->query, true);
                 $op['custom_flag'] = true;
 
-                return new BuildResult(
+                return new Plan(
                     \json_encode($op, JSON_THROW_ON_ERROR),
                     $result->bindings,
                     $result->readOnly

tests/Query/Builder/MySQLTest.php

@@ -5,7 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Tests\Query\AssertsBindingCount;
 use Tests\Query\Fixture\PermissionFilter as Permission;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 use Utopia\Query\Builder\Case\Builder as CaseBuilder;
 use Utopia\Query\Builder\Case\Expression;
 use Utopia\Query\Builder\Condition;
@@ -11846,8 +11846,8 @@ public function testAfterBuildCallback(): void
     {
         $result = (new Builder())
             ->from('users')
-            ->afterBuild(function (BuildResult $result) {
-                return new BuildResult(
+            ->afterBuild(function (Plan $result) {
+                return new Plan(
                     '/* traced */ ' . $result->query,
                     $result->bindings,
                     $result->readOnly
@@ -14305,8 +14305,8 @@ public function testAfterBuildCallbackTransformsResult(): void
         $result = (new Builder())
             ->from('t')
             ->filter([Query::equal('status', ['active'])])
-            ->afterBuild(function (BuildResult $r) {
-                return new BuildResult(
+            ->afterBuild(function (Plan $r) {
+                return new Plan(
                     '/* traced */ ' . $r->query,
                     $r->bindings,
                     $r->readOnly,

tests/Query/Builder/PostgreSQLTest.php

@@ -5320,8 +5320,8 @@ public function testAfterBuildCallbackWrapsQuery(): void
         $result = (new Builder())
             ->from('t')
             ->select(['id'])
-            ->afterBuild(function (\Utopia\Query\Builder\BuildResult $r): \Utopia\Query\Builder\BuildResult {
-                return new \Utopia\Query\Builder\BuildResult(
+            ->afterBuild(function (\Utopia\Query\Builder\Plan $r): \Utopia\Query\Builder\Plan {
+                return new \Utopia\Query\Builder\Plan(
                     'SELECT * FROM (' . $r->query . ') AS wrapped',
                     $r->bindings,
                     $r->readOnly,

tests/Query/Builder/SQLiteTest.php

@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Tests\Query\AssertsBindingCount;
-use Utopia\Query\Builder\BuildResult;
+use Utopia\Query\Builder\Plan;
 use Utopia\Query\Builder\Feature\ConditionalAggregates;
 use Utopia\Query\Builder\Feature\Json;
 use Utopia\Query\Builder\SQLite as Builder;
@@ -1417,7 +1417,7 @@ public function testAfterBuildCallback(): void
         $result = (new Builder())
             ->from('users')
             ->filter([Query::equal('status', ['active'])])
-            ->afterBuild(function (BuildResult $r) use (&$capturedQuery) {
+            ->afterBuild(function (Plan $r) use (&$capturedQuery) {
                 $capturedQuery = 'executed';
                 return $r;
             })