Orm fixes

phact-cmf · Nov 17, 2019 · 0119327 · 0119327
1 parent f19c3eb
commit 0119327
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/Phact/Orm/LookupManager.php b/src/Phact/Orm/LookupManager.php
@@ -82,6 +82,9 @@ public function processContains($query, $column, $value, $operator)
      */
     public function processIn($query, $column, $value, $operator)
     {
+        if (empty($value)) {
+            return QueryLayer::buildWhere(1, '=', 0, $operator);
+        }
         return QueryLayer::buildWhere($column, 'IN', $value, $operator);
     }
 

diff --git a/src/Phact/Orm/Model.php b/src/Phact/Orm/Model.php
@@ -496,7 +496,7 @@ protected function _provideEvent($eventName)
             $this->{$metaEvent}();
             if ($event) {
                 $event->trigger(self::class . '::' . $metaEvent, [], $this);
-                $event->trigger('model.' . $eventName, [], $this);
+                $event->trigger('model.' . $metaEvent, [], $this);
             }
         }
     }

diff --git a/tests/Cases/Orm/Abs/AbstractQuerySetTest.php b/tests/Cases/Orm/Abs/AbstractQuerySetTest.php
@@ -549,6 +549,8 @@ public function testWithAll()
         $this->assertCount(1, $books);
         $this->assertInstanceOf(Book::class, $books[0]);
         $this->assertEquals('Second book', $books[0]->name);
+
+        $this->assertEquals([], Author::objects()->filter(['id' => 100])->with(['books'])->all());
     }
 
     public function testWithValues()