Merge pull request #9 from utopia-php/fix-builder-throws

refactor(schema/builder): no methods that throw — gate dialect features per type

Author: abnegate

.gitignore

@@ -5,6 +5,6 @@ composer.phar
 coverage
 coverage.xml
 .DS_Store
-.claude/worktrees/
+.claude/
 .phpunit.cache/
 coverage/

src/Query/Builder.php

@@ -390,15 +390,6 @@ private function compileWhenCondition(WhenClause $when): string
         }
     }
 
-    /**
-     * Build an INSERT ... ON CONFLICT/DUPLICATE KEY UPDATE statement.
-     * Requires onConflict() to be called first to configure conflict keys and update columns.
-     */
-    public function upsert(): Statement
-    {
-        throw new UnsupportedException('UPSERT is not supported by this dialect.');
-    }
-
     #[\Override]
     public function build(): Statement
     {

src/Query/Builder/Feature/InsertOrIgnore.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Utopia\Query\Builder\Feature;
+
+use Utopia\Query\Builder\Statement;
+
+interface InsertOrIgnore
+{
+    public function insertOrIgnore(): Statement;
+}

src/Query/Builder/Feature/Upsert.php

@@ -7,8 +7,4 @@
 interface Upsert
 {
     public function upsert(): Statement;
-
-    public function insertOrIgnore(): Statement;
-
-    public function upsertSelect(): Statement;
 }

src/Query/Builder/Feature/UpsertSelect.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Utopia\Query\Builder\Feature;
+
+use Utopia\Query\Builder\Statement;
+
+interface UpsertSelect
+{
+    public function upsertSelect(): Statement;
+}

src/Query/Builder/MongoDB.php

@@ -5,6 +5,7 @@
 use stdClass;
 use Utopia\Query\Builder as BaseBuilder;
 use Utopia\Query\Builder\Feature\FullTextSearch;
+use Utopia\Query\Builder\Feature\InsertOrIgnore;
 use Utopia\Query\Builder\Feature\MongoDB\ArrayPushModifiers;
 use Utopia\Query\Builder\Feature\MongoDB\AtlasSearch;
 use Utopia\Query\Builder\Feature\MongoDB\ConditionalArrayUpdates;
@@ -22,6 +23,7 @@
 
 class MongoDB extends BaseBuilder implements
     Upsert,
+    InsertOrIgnore,
     FullTextSearch,
     TableSampling,
     FieldUpdates,
@@ -358,7 +360,6 @@ public function delete(): Statement
         );
     }
 
-    #[\Override]
     public function upsert(): Statement
     {
         $this->bindings = [];
@@ -436,12 +437,6 @@ public function insertOrIgnore(): Statement
         );
     }
 
-    #[\Override]
-    public function upsertSelect(): Statement
-    {
-        throw new UnsupportedException('upsertSelect() is not supported in MongoDB builder.');
-    }
-
     private function needsAggregation(ParsedQuery $grouped): bool
     {
         if (! empty(Query::getByType($this->pendingQueries, [Method::OrderRandom], false))) {

src/Query/Builder/MySQL.php

@@ -3,21 +3,41 @@
 namespace Utopia\Query\Builder;
 
 use Utopia\Query\Builder\Feature\ConditionalAggregates;
+use Utopia\Query\Builder\Feature\FullTextSearch;
 use Utopia\Query\Builder\Feature\GroupByModifiers;
 use Utopia\Query\Builder\Feature\Hints;
+use Utopia\Query\Builder\Feature\InsertOrIgnore;
 use Utopia\Query\Builder\Feature\Json;
 use Utopia\Query\Builder\Feature\LateralJoins;
+use Utopia\Query\Builder\Feature\Spatial;
 use Utopia\Query\Builder\Feature\StringAggregates;
+use Utopia\Query\Builder\Feature\Upsert;
+use Utopia\Query\Builder\Feature\UpsertSelect;
 use Utopia\Query\Exception\ValidationException;
 use Utopia\Query\Method;
 
-class MySQL extends SQL implements Json, Hints, ConditionalAggregates, LateralJoins, StringAggregates, GroupByModifiers
+class MySQL extends SQL implements
+    Json,
+    Hints,
+    ConditionalAggregates,
+    LateralJoins,
+    StringAggregates,
+    GroupByModifiers,
+    Spatial,
+    FullTextSearch,
+    Upsert,
+    UpsertSelect,
+    InsertOrIgnore
 {
     use Trait\ConditionalAggregates;
+    use Trait\FullTextSearch;
     use Trait\GroupByModifiers;
     use Trait\Hints;
     use Trait\LateralJoins;
+    use Trait\Spatial;
     use Trait\StringAggregates;
+    use Trait\Upsert;
+    use Trait\UpsertSelect;
 
     protected string $updateJoinTable = '';
 

src/Query/Builder/PostgreSQL.php

@@ -6,7 +6,9 @@
 use Utopia\Query\AST\Serializer\PostgreSQL as PostgreSQLSerializer;
 use Utopia\Query\Builder\Feature\ConditionalAggregates;
 use Utopia\Query\Builder\Feature\FullOuterJoins;
+use Utopia\Query\Builder\Feature\FullTextSearch;
 use Utopia\Query\Builder\Feature\GroupByModifiers;
+use Utopia\Query\Builder\Feature\InsertOrIgnore;
 use Utopia\Query\Builder\Feature\Json;
 use Utopia\Query\Builder\Feature\LateralJoins;
 use Utopia\Query\Builder\Feature\PostgreSQL\AggregateFilter;
@@ -17,8 +19,11 @@
 use Utopia\Query\Builder\Feature\PostgreSQL\Returning;
 use Utopia\Query\Builder\Feature\PostgreSQL\VectorSearch;
 use Utopia\Query\Builder\Feature\Sequences;
+use Utopia\Query\Builder\Feature\Spatial;
 use Utopia\Query\Builder\Feature\StringAggregates;
 use Utopia\Query\Builder\Feature\TableSampling;
+use Utopia\Query\Builder\Feature\Upsert;
+use Utopia\Query\Builder\Feature\UpsertSelect;
 use Utopia\Query\Builder\PostgreSQL\DeleteUsing;
 use Utopia\Query\Builder\PostgreSQL\MergeTarget;
 use Utopia\Query\Builder\PostgreSQL\UpdateFrom;
@@ -27,9 +32,30 @@
 use Utopia\Query\Query;
 use Utopia\Query\Schema\ColumnType;
 
-class PostgreSQL extends SQL implements VectorSearch, Json, Returning, LockingOf, ConditionalAggregates, Merge, LateralJoins, TableSampling, FullOuterJoins, StringAggregates, OrderedSetAggregates, DistinctOn, AggregateFilter, GroupByModifiers, Sequences
+class PostgreSQL extends SQL implements
+    VectorSearch,
+    Json,
+    Returning,
+    LockingOf,
+    ConditionalAggregates,
+    Merge,
+    LateralJoins,
+    TableSampling,
+    FullOuterJoins,
+    StringAggregates,
+    OrderedSetAggregates,
+    DistinctOn,
+    AggregateFilter,
+    GroupByModifiers,
+    Sequences,
+    Spatial,
+    FullTextSearch,
+    Upsert,
+    UpsertSelect,
+    InsertOrIgnore
 {
     use Trait\FullOuterJoins;
+    use Trait\FullTextSearch;
     use Trait\GroupByModifiers;
     use Trait\LateralJoins;
     use Trait\PostgreSQL\AggregateFilter;
@@ -40,7 +66,14 @@ class PostgreSQL extends SQL implements VectorSearch, Json, Returning, LockingOf
     use Trait\PostgreSQL\Sequences;
     use Trait\PostgreSQL\VectorSearch;
     use Trait\Returning;
+    use Trait\Spatial;
     use Trait\StringAggregates;
+    use Trait\Upsert {
+        upsert as private baseUpsert;
+    }
+    use Trait\UpsertSelect {
+        upsertSelect as private baseUpsertSelect;
+    }
 
     protected string $wrapChar = '"';
 
@@ -337,20 +370,14 @@ private function mergeIntoWhereClause(array &$parts, array $extra): void
         $parts[] = 'WHERE ' . \implode(' AND ', $extra);
     }
 
-    #[\Override]
     public function upsert(): Statement
     {
-        $result = parent::upsert();
-
-        return $this->appendReturning($result);
+        return $this->appendReturning($this->baseUpsert());
     }
 
-    #[\Override]
     public function upsertSelect(): Statement
     {
-        $result = parent::upsertSelect();
-
-        return $this->appendReturning($result);
+        return $this->appendReturning($this->baseUpsertSelect());
     }
 
     #[\Override]

src/Query/Builder/SQL.php

@@ -4,34 +4,26 @@
 
 use Utopia\Query\Builder as BaseBuilder;
 use Utopia\Query\Builder\Feature\BitwiseAggregates;
-use Utopia\Query\Builder\Feature\FullTextSearch;
 use Utopia\Query\Builder\Feature\Locking;
-use Utopia\Query\Builder\Feature\Spatial;
 use Utopia\Query\Builder\Feature\StatisticalAggregates;
 use Utopia\Query\Builder\Feature\Transactions;
-use Utopia\Query\Builder\Feature\Upsert;
 use Utopia\Query\Method;
 use Utopia\Query\Query;
 use Utopia\Query\QuotesIdentifiers;
 use Utopia\Query\Schema\ColumnType;
 
-abstract class SQL extends BaseBuilder implements Locking, Transactions, Upsert, Spatial, FullTextSearch, StatisticalAggregates, BitwiseAggregates
+abstract class SQL extends BaseBuilder implements Locking, Transactions, StatisticalAggregates, BitwiseAggregates
 {
     use QuotesIdentifiers;
     use Trait\BitwiseAggregates;
-    use Trait\FullTextSearch;
     use Trait\Json;
     use Trait\Locking;
-    use Trait\Spatial;
     use Trait\StatisticalAggregates;
     use Trait\Transactions;
-    use Trait\Upsert;
 
     /** @var array<string, Condition> */
     protected array $jsonSets = [];
 
-    abstract public function insertOrIgnore(): Statement;
-
     abstract protected function compileConflictHeader(): string;
 
     abstract protected function compileConflictAssignment(string $wrapped): string;

src/Query/Builder/SQLite.php

@@ -5,16 +5,21 @@
 use Utopia\Query\AST\Serializer;
 use Utopia\Query\AST\Serializer\SQLite as SQLiteSerializer;
 use Utopia\Query\Builder\Feature\ConditionalAggregates;
+use Utopia\Query\Builder\Feature\InsertOrIgnore;
 use Utopia\Query\Builder\Feature\Json;
 use Utopia\Query\Builder\Feature\StringAggregates;
+use Utopia\Query\Builder\Feature\Upsert;
+use Utopia\Query\Builder\Feature\UpsertSelect;
 use Utopia\Query\Exception\UnsupportedException;
 use Utopia\Query\Exception\ValidationException;
 use Utopia\Query\Method;
 
-class SQLite extends SQL implements Json, ConditionalAggregates, StringAggregates
+class SQLite extends SQL implements Json, ConditionalAggregates, StringAggregates, InsertOrIgnore, Upsert, UpsertSelect
 {
     use Trait\ConditionalAggregates;
     use Trait\StringAggregates;
+    use Trait\Upsert;
+    use Trait\UpsertSelect;
 
     /** @var array<string, Condition> */
     protected array $jsonSets = [];