for SQL too

atk4 · Nov 23, 2024 · e854ec9 · e854ec9
1 parent 776205f
commit e854ec9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/src/Persistence/Sql/Query.php b/src/Persistence/Sql/Query.php
@@ -596,19 +596,11 @@ protected function _subrenderCondition(array $row): string
         }
 
         if ($operator === null) {
-            if ($value instanceof Expressionable) {
-                $value = $value->getDsqlExpression($this);
-            }
-
-            if ($value instanceof self && $value->mode === 'select') {
-                $operator = 'in';
-            } else {
-                $operator = '=';
-            }
-        } else {
-            $operator = strtolower($operator);
+            $operator = '=';
         }
 
+        $operator = strtolower($operator);
+
         if (!in_array($operator, $this->supportedOperators, true)) {
             throw (new Exception('Unsupported operator'))
                 ->addMoreInfo('operator', $operator);

diff --git a/src/Reference/HasMany.php b/src/Reference/HasMany.php
@@ -87,6 +87,7 @@ public function ref(Model $ourModelOrEntity, array $defaults = []): Model
 
         return $this->createTheirModel($defaults)->addCondition(
             $this->getTheirFieldName(),
+            $ourModelOrEntity->isEntity() ? '=' : 'in',
             $this->getOurFieldValueForRefCondition($ourModelOrEntity)
         );
     }

diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -135,7 +135,7 @@ public function ref(Model $ourModelOrEntity, array $defaults = []): Model
             $ourFieldExpression = $ourModelOrEntity->action('field', [$this->getOurField()]);
 
             $theirModel->getModel(true)
-                ->addCondition($this->getTheirFieldName($theirModel), $ourFieldExpression);
+                ->addCondition($this->getTheirFieldName($theirModel), 'in', $ourFieldExpression);
         }
 
         return $theirModel;

diff --git a/tests/Persistence/Sql/QueryTest.php b/tests/Persistence/Sql/QueryTest.php
@@ -650,7 +650,7 @@ public function testWhereBasic(): void
             $this->q('[where]')->where('id', 'in', [1, 2])->render()[0]
         );
         self::assertSame(
-            'where "id" in (select * from "user")',
+            'where "id" = (select * from "user")',
             $this->q('[where]')->where('id', $this->q()->table('user'))->render()[0]
         );