Fix calculation of whereIn when multiple conditions.

Michael Deck · Michael Deck · commit b0d73ad4e131 · 2022-07-11T12:03:27.000-04:00
diff --git a/src/Database/Query/FMBaseBuilder.php b/src/Database/Query/FMBaseBuilder.php
@@ -474,7 +474,9 @@ protected function computeWhereIns()
             return;
         }
 
-        $this->wheres = Arr::crossJoin($this->wheres, ...$whereIns);
+        $this->wheres = Arr::map(Arr::crossJoin($this->wheres, ...$whereIns), function($conditions) {
+            return array_merge(...array_values($conditions));
+        });
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,9 @@ protected function computeWhereIns()`
`474`	`474`	`return;`
`475`	`475`	`}`
`476`	`476`
`477`		`- $this->wheres = Arr::crossJoin($this->wheres, ...$whereIns);`
	`477`	`+ $this->wheres = Arr::map(Arr::crossJoin($this->wheres, ...$whereIns), function($conditions) {`
	`478`	`+ return array_merge(...array_values($conditions));`
	`479`	`+ });`
`478`	`480`	`}`
`479`	`481`
`480`	`482`	`/**`