Merge pull request #91 from perplorm/fix_array_contains

fix query structure with array contains

Author: mringler

src/Propel/Generator/Builder/Om/QueryBuilder.php

@@ -1089,17 +1089,17 @@ public function filterBy$colPhpName(\$$variableName = null, ?string \$comparison
         }";
         } elseif ($col->getType() == PropelTypes::PHP_ARRAY) {
             $script .= "
-        if (
-            \$comparison === null 
-            || \$comparison === Criteria::CONTAINS_ALL 
-            || \$comparison === Criteria::CONTAINS_SOME 
-            || \$comparison === Criteria::CONTAINS_NONE
-        ) {
+        \$arrayOps = [null, Criteria::CONTAINS_ALL, Criteria::CONTAINS_SOME, Criteria::CONTAINS_NONE];
+        if (in_array(\$comparison, \$arrayOps, true)) {
             \$andOr = (\$comparison === Criteria::CONTAINS_SOME) ? Criteria::LOGICAL_OR : Criteria::LOGICAL_AND;
             \$operator = (\$comparison === Criteria::CONTAINS_NONE) ? Criteria::NOT_LIKE : Criteria::LIKE;
+
+            \$this->combineFilters();
             foreach (\$$variableName as \$value) {
                 \$this->addFilterWithConjunction(\$andOr, \$resolvedColumn, \"%| \$value |%\", \$operator);
             }
+            \$this->endCombineFilters();
+
             if (\$comparison == Criteria::CONTAINS_NONE) {
                 \$this->addOr(\$resolvedColumn, null, Criteria::ISNULL);
             }

tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php

@@ -258,4 +258,32 @@ public function testFilterBySingularColumnUsingContainsNone()
         $this->assertEquals([], $e[0]->getTags(), 'array columns are searchable by element using Criteria::CONTAINS_NONE');
         $this->assertEquals(['bar23'], $e[1]->getTags(), 'array columns are searchable by element using Criteria::CONTAINS_NONE');
     }
+
+    public function queryStructureDataProvider(): array
+    {
+        $t = 'complex_column_type_entity_11';
+        $sf = "SELECT  FROM $t WHERE $t.id=:p1";
+
+        return [
+            [Criteria::CONTAINS_ALL, "$sf AND ($t.tags LIKE :p2 AND $t.tags LIKE :p3)"],
+            [Criteria::CONTAINS_SOME, "$sf AND ($t.tags LIKE :p2 OR $t.tags LIKE :p3)"],
+            [Criteria::CONTAINS_NONE, "$sf AND (($t.tags NOT LIKE :p2 AND $t.tags NOT LIKE :p3) OR $t.tags IS NULL )"],
+            [null, "$sf AND ($t.tags LIKE :p2 AND $t.tags LIKE :p3)"],
+        ];
+    }
+    /**
+     * @dataProvider queryStructureDataProvider
+     *
+     * @return void
+     */
+    public function testQueryStructure(string|null $op, string $expected)
+    {
+        $p = [];
+        $actually = ComplexColumnTypeEntity11Query::create()
+            ->filterById(1)
+            ->filterByTags(['a', 'b'], $op)
+            ->createSelectSql($p);
+
+        $this->assertEquals($expected, $actually);
+    }
 }