r

atk4 · Apr 17, 2021 · b62886d · b62886d
1 parent cc4912c
commit b62886d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 35 deletions.
diff --git a/src/Persistence/Array_.php b/src/Persistence/Array_.php
@@ -332,15 +332,7 @@ protected function setLimitOrder(Model $model, \Atk4\Data\Action\Iterator $actio
      */
     public function applyScope(Model $model, \Atk4\Data\Action\Iterator $iterator)
     {
-        $scope = $model->scope();
-
-        // add entity ID to scope to allow easy traversal
-        if ($model->id_field && $model->getId() !== null) {
-            $scope = new Model\Scope([$scope]);
-            $scope->addCondition($model->getField($model->id_field), $model->getId());
-        }
-
-        return $iterator->filter($scope);
+        return $iterator->filter($model->scope());
     }
 
     /**

diff --git a/src/Persistence/Sql.php b/src/Persistence/Sql.php
@@ -364,23 +364,12 @@ protected function setLimitOrder(Model $model, Query $query)
     }
 
     /**
-     * Will apply $model->scope() conditions onto $query.
+     * Will apply a condition defined inside $condition or $model->scope() onto $query.
      */
-    public function initQueryConditions(Model $model, Query $query): void
+    public function initQueryConditions(Model $model, Query $query, Model\Scope\AbstractScope $condition = null): void
     {
-        $scope = $model->scope();
+        $condition = $condition ?? $model->scope();
 
-        // add entity ID to scope to allow easy traversal
-        if ($model->id_field && $model->getId() !== null) {
-            $scope = new Model\Scope([$scope]);
-            $scope->addCondition($model->getField($model->id_field), $model->getId());
-        }
-
-        $this->_initQueryConditions($query, $scope);
-    }
-
-    private function _initQueryConditions(Query $query, Model\Scope\AbstractScope $condition = null): void
-    {
         if (!$condition->isEmpty()) {
             // peel off the single nested scopes to convert (((field = value))) to field = value
             $condition = $condition->simplify();
@@ -395,7 +384,7 @@ private function _initQueryConditions(Query $query, Model\Scope\AbstractScope $c
                 $expression = $condition->isOr() ? $query->orExpr() : $query->andExpr();
 
                 foreach ($condition->getNestedConditions() as $nestedCondition) {
-                    $this->_initQueryConditions($expression, $nestedCondition);
+                    $this->initQueryConditions($model, $expression, $nestedCondition);
                 }
 
                 $query->where($expression);

diff --git a/tests/ConditionSqlTest.php b/tests/ConditionSqlTest.php
@@ -6,6 +6,7 @@
 
 use Atk4\Data\Model;
 use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 
 class ConditionSqlTest extends \Atk4\Schema\PhpunitTestCase
 {
@@ -29,21 +30,17 @@ public function testBasic()
 
         $mm = clone $m;
         $mm->addCondition('gender', 'M');
-
-        $this->assertSameSql(
-            'select "id","name","gender" from "user" where "gender" = :a',
-            $mm->action('select')->render()
-        );
-
         $mm->tryLoad(1);
         $this->assertSame('John', $mm->get('name'));
         $mm->tryLoad(2);
         $this->assertNull($mm->get('name'));
 
-        $this->assertSameSql(
-            'select "id","name","gender" from "user" where ("gender" = :a and "id" = :b)',
-            $mm->action('select')->render()
-        );
+        if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
+            $this->assertSame(
+                'select "id","name","gender" from "user" where "gender" = :a',
+                $mm->action('select')->render()
+            );
+        }
 
         $mm = clone $m;
         $mm->withId(2); // = addCondition(id, 2)

diff --git a/tests/RandomTest.php b/tests/RandomTest.php
@@ -380,7 +380,7 @@ public function testGetTitle()
 
         $m->load(2);
         $this->assertSame('Sue', $m->getTitle()); // loaded returns title_field value
-        $this->assertSame([2 => 'Sue'], $m->getTitles()); // traverse loaded
+        $this->assertSame([1 => 'John', 2 => 'Sue'], $m->getTitles()); // all titles
 
         // set custom title_field
         $m->title_field = 'parent_item_id';