Merge pull request #2 from SoftwarePunt/fix-multiple-bound-arrays

fix(Query): multiple IN()s in a one clause don't work
SoftwarePunt · Aug 23, 2023 · 3368f2c · 3368f2c
2 parents 90cc397 + 3b2fe67
commit 3368f2c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/.idea/instarecord.iml b/.idea/instarecord.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/lib/Database/Query.php b/lib/Database/Query.php
@@ -437,10 +437,9 @@ protected function processStatementParameters(string $statementText, array $para
 
                         if ($markerSkip <= 0) {
                             break;
-                        } else {
-                            $markerOffset += $markerIdx + 1;
                         }
 
+                        $markerOffset = $markerIdx + 1;
                         $markerSkip--;
                     }
 
@@ -451,11 +450,10 @@ protected function processStatementParameters(string $statementText, array $para
                         $extraMarkersStr = "";
 
                         for ($i = 0; $i < $extraMarkers; $i++) {
-                            $extraMarkersStr .= ", ?";
+                            $extraMarkersStr .= ", #_TEMP_MARKER_#";
                         }
 
                         $statementText = substr_replace($statementText, $extraMarkersStr, $markerIdx + 1, 0);
-                        $finalizedRow[0] = $statementText;
                     }
 
                     // Bind each parameter
@@ -468,6 +466,9 @@ protected function processStatementParameters(string $statementText, array $para
             }
         }
 
+        $statementText = str_replace('#_TEMP_MARKER_#', '?', $statementText);
+        $finalizedRow[0] = $statementText;
+
         return $finalizedRow;
     }
 

diff --git a/tests/Database/QueryTest.php b/tests/Database/QueryTest.php
@@ -318,6 +318,29 @@ public function testWhereWithAnd()
         $this->assertEquals('DELETE FROM fruits WHERE (type = ?) AND (color IN (?, ?)) AND (tastes_nice = 1);', $queryString);
     }
 
+    public function testWhereWithMultipleINs()
+    {
+        $query = new Query(new Connection(new DatabaseConfig()));
+
+        $query = $query->delete()
+            ->from('fruits')
+            ->where('color = ? OR (color IN (?)) OR (color IN (?))',
+                'pink', ['red', 'blue', 'orange'], ['blurple', 'black']);
+
+        $queryString = $query->createStatementText();
+
+        $this->assertEquals('DELETE FROM fruits WHERE (color = ? OR (color IN (?, ?, ?)) OR (color IN (?, ?)));', $queryString);
+
+        $this->assertEquals([
+            'pink',
+            'red',
+            'blue',
+            'orange',
+            'blurple',
+            'black'
+        ], $query->getBoundParametersForGeneratedStatement());
+    }
+
     public function testHaving()
     {
         $query = new Query(new Connection(new DatabaseConfig()));