Merge pull request #217 from moufmouf/fix_multiple_pk_in_oracle

Fixing count query in Oracle when there are multiple PK
thecodingmachine · Jul 22, 2020 · 0093d98 · 0093d98
2 parents 4da6502 + 5d61660
commit 0093d98
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     ],
     "require" : {
         "php" : ">=7.2",
-        "mouf/magic-query" : "^1.4",
+        "mouf/magic-query" : "^1.4.3",
         "mouf/schema-analyzer": "^1.1.4",
         "doctrine/dbal": "^2.9.2",
         "psr/log": "~1.0",

diff --git a/src/QueryFactory/FindObjectsQueryFactory.php b/src/QueryFactory/FindObjectsQueryFactory.php
@@ -5,6 +5,7 @@
 
 use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
+use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use TheCodingMachine\TDBM\OrderByAnalyzer;
 use TheCodingMachine\TDBM\TDBMService;
@@ -55,18 +56,22 @@ protected function compute(): void
 
         $subQuery = 'SELECT DISTINCT '.implode(', ', $pkColumnNames).' FROM MAGICJOIN('.$this->mainTable.')';
 
+        if (!empty($this->filterString)) {
+            $sql .= ' WHERE '.$this->filterString;
+            $subQuery .= ' WHERE '.$this->filterString;
+        }
+
         if (count($pkColumnNames) === 1 || $this->tdbmService->getConnection()->getDatabasePlatform() instanceof MySqlPlatform) {
             $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM MAGICJOIN('.$this->mainTable.')';
+            if (!empty($this->filterString)) {
+                $countSql .= ' WHERE '.$this->filterString;
+            }
+        } elseif ($this->tdbmService->getConnection()->getDatabasePlatform() instanceof OraclePlatform) {
+            $countSql = 'SELECT COUNT(*) FROM ('.$subQuery.')';
         } else {
             $countSql = 'SELECT COUNT(*) FROM ('.$subQuery.') tmp';
         }
 
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-            $subQuery .= ' WHERE '.$this->filterString;
-        }
-
         if (!empty($orderString)) {
             $sql .= ' ORDER BY '.$orderString;
         }