Merge pull request #1 from cepaim/cepaim-prepareModels-union

Update ActiveDataProvider::prepareModels() to avoid SQL error with UNION queries
cepaim · Aug 16, 2024 · a1807f9 · a1807f9
2 parents 34d2396 + 6356e60
commit a1807f9
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
@@ -101,17 +101,29 @@ protected function prepareModels()
             throw new InvalidConfigException('The "query" property must be an instance of a class that implements the QueryInterface e.g. yii\db\Query or its subclasses.');
         }
         $query = clone $this->query;
+
+        $has_union = $query->union && count($query->union);
         if (($pagination = $this->getPagination()) !== false) {
             $pagination->totalCount = $this->getTotalCount();
             if ($pagination->totalCount === 0) {
                 return [];
             }
-            $query->limit($pagination->getLimit())->offset($pagination->getOffset());
+            if ($has_union) {
+                $query->union[count($query->union)-1]['query']->limit($pagination->getLimit())->offset($pagination->getOffset());
+            } else {
+                $query->limit($pagination->getLimit())->offset($pagination->getOffset());
+            }
         }
         if (($sort = $this->getSort()) !== false) {
             $query->addOrderBy($sort->getOrders());
+        }   
+        if ($has_union) {
+            if ($query->orderBy) {
+                $query->union[count($query->union)-1]['query']->addOrderBy($query->orderBy);
+                $query->orderBy = null;
+            }
         }
-
+        
         return $query->all($this->db);
     }