Rewrite query for numRows function for SELECT queries

diff --git a/lib/db.php b/lib/db.php
index 49eeeea430cedb1e2c5649afa3e0e973745e7088..379cb342db5abe286bed9fdbe7b00ef6c2355e74 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -661,7 +661,14 @@ class DoctrineStatementWrapper {
         * provide numRows
         */
        public function numRows() {
-               return $this->statement->rowCount();
+               $regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
+               $queryString = $this->statement->getWrappedStatement()->queryString;
+               if (preg_match($regex, $queryString, $output) > 0) {
+                       $query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}", PDO::FETCH_NUM);
+                       return $query->execute($this->lastArguments)->fetchColumn();
+               }else{
+                       return $this->statement->rowCount();
+               }
        }
 
        /**