Merge pull request #14 from heiglandreas/handleEmptyArrayWithInClause

Fix issue with empty array for IN-clause

Author: Alexander Miertsch

src/PostgresDocumentStore.php

@@ -750,6 +750,14 @@ private function filterToWhereClause(Filter $filter, $argsCount = 0): array
                 [$innerFilterStr, $args, $argsCount] = $this->filterToWhereClause($innerFilter, $argsCount);
 
                 if($innerFilter instanceof DocumentStore\Filter\AnyOfFilter || $innerFilter instanceof DocumentStore\Filter\AnyOfDocIdFilter) {
+                    if ($argsCount === 0) {
+                        return [
+                            substr_replace(' 1 != 1 ', ' 1 = 1 ', $innerFilterStr),
+                            $args,
+                            $argsCount
+                        ];
+                    }
+
                     $inPos = strpos($innerFilterStr, ' IN(');
                     $filterStr = substr_replace($innerFilterStr, ' NOT IN(', $inPos, 4 /* " IN(" */);
                     return [$filterStr, $args, $argsCount];
@@ -795,6 +803,9 @@ private function isPropFilter(Filter $filter): bool
 
     private function makeInClause(string $prop, array $valList, int $argsCount, bool $jsonEncode = false): array
     {
+        if ($valList === []) {
+            return [' 1 != 1 ', [], 0];
+        }
         $argList = [];
         $params = \implode(",", \array_map(function ($val) use (&$argsCount, &$argList, $jsonEncode) {
             $param = ":a$argsCount";

tests/PostgresDocumentStoreTest.php

@@ -203,6 +203,32 @@ public function it_handles_any_of_filter()
         $this->assertCount(2, $filteredDocs);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_any_of_filter_with_empty_args()
+    {
+        $collectionName = 'test_any_of_filter_with_empty_args';
+        $this->documentStore->addCollection($collectionName);
+
+        $doc1 = ["foo" => "bar"];
+        $doc2 = ["foo" => "baz"];
+        $doc3 = ["foo" => "bat"];
+
+        $docs = [$doc1, $doc2, $doc3];
+
+        array_walk($docs, function (array $doc) use ($collectionName) {
+            $this->documentStore->addDoc($collectionName, Uuid::uuid4()->toString(), $doc);
+        });
+
+        $filteredDocs = $this->documentStore->filterDocs(
+            $collectionName,
+            new AnyOfFilter("foo", [])
+        );
+
+        $this->assertCount(0, $filteredDocs);
+    }
+
     /**
      * @test
      */
@@ -262,6 +288,37 @@ public function it_handles_not_any_of_filter()
         $this->assertSame('baz', $filteredDocs[0]['foo']);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_not_any_of_filter_with_empty_args()
+    {
+        $collectionName = 'test_not_any_of_filter_with_empty_args';
+        $this->documentStore->addCollection($collectionName);
+
+        $doc1 = ["foo" => "bar"];
+        $doc2 = ["foo" => "baz"];
+        $doc3 = ["foo" => "bat"];
+
+        $docs = [$doc1, $doc2, $doc3];
+
+        array_walk($docs, function (array $doc) use ($collectionName) {
+            $this->documentStore->addDoc($collectionName, Uuid::uuid4()->toString(), $doc);
+        });
+
+        $filteredDocs = $this->documentStore->filterDocs(
+            $collectionName,
+            new NotFilter(new AnyOfFilter("foo", []))
+        );
+
+        $filteredDocs = iterator_to_array($filteredDocs);
+
+        $this->assertCount(3, $filteredDocs);
+
+        $this->assertSame('baz', $filteredDocs[1]['foo']);
+        $this->assertSame('bat', $filteredDocs[2]['foo']);
+    }
+
     /**
      * @test
      */
@@ -316,6 +373,36 @@ public function it_handles_any_of_doc_id_filter()
         $this->assertEquals(['bar', 'baz'], $vals);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_any_of_doc_id_filter_with_empty_args()
+    {
+        $collectionName = 'test_any_of_doc_id_filter_with_empty_args';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => 'bar']);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => 'bat']);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => 'baz']);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new AnyOfDocIdFilter([])
+        ));
+
+        $this->assertCount(0, $filteredDocs);
+
+        $vals = array_map(function (array $doc) {
+            return $doc['foo'];
+        }, $filteredDocs);
+
+        $this->assertEquals([], $vals);
+    }
+
     /**
      * @test
      */
@@ -346,6 +433,36 @@ public function it_handles_not_any_of_id_filter()
         $this->assertEquals(['bat'], $vals);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_not_any_of_id_filter_with_empty_args()
+    {
+        $collectionName = 'test_any_of_doc_id_filter_with_empty_args';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => 'bar']);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => 'bat']);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => 'baz']);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new NotFilter(new AnyOfDocIdFilter([]))
+        ));
+
+        $this->assertCount(3, $filteredDocs);
+
+        $vals = array_map(function (array $doc) {
+            return $doc['foo'];
+        }, $filteredDocs);
+
+        $this->assertEquals(['bar', 'bat', 'baz'], $vals);
+    }
+
     /**
      * @test
      */