multiple pk where logic updated in dataprovider

Author: Smoren

commands/NewController.php

@@ -153,4 +153,10 @@ public function actionPdo()
 
         print_r($result);
     }
+
+    public function actionTest()
+    {
+        $q = Address::find()->andWhere(['IN', ['id', 'city_id'], [['id' => 1, 'city_id' => 1], ['id' => 3, 'city_id' => 2]]])->createCommand()->getRawSql();
+        $a = 1;
+    }
 }

qrm/ActiveRecord/QueryRelationDataProvider.php

@@ -81,17 +81,17 @@ protected function prepareModels()
                     ->offset($offset)
                     ->all();
 
-                $models = $this->queryRelationManager->filter(function(Query $q) use ($pkValues, $mainTable) {
-                    $orWheres = ['OR'];
-                    foreach($pkValues as $rows) {
-                        $orWhere = [];
-                        foreach($rows as $field => $value) {
-                            $orWhere["`{$mainTable->alias}`.`$field`"] = $value;
-                        }
-                        $orWheres[] = $orWhere;
+                $pkValuesPrefixed = [];
+                foreach($pkValues as $row) {
+                    $rowPrefixed = [];
+                    foreach($row as $field => $value) {
+                        $rowPrefixed["`{$mainTable->alias}`.`{$field}`"] = $value;
                     }
+                    $pkValuesPrefixed[] = $rowPrefixed;
+                }
 
-                    $q->andWhere($orWheres);
+                $models = $this->queryRelationManager->filter(function(Query $q) use ($pkFields, $pkValuesPrefixed, $mainTable) {
+                    $q->andWhere(['in', $pkFields, $pkValuesPrefixed]);
                 })->all();
             }
         }