Fixes to countDataRows methods in various sources

rapidwebltd · Mar 28, 2018 · 20e30fb · 20e30fb
1 parent cae1b92
commit 20e30fb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/Objects/Sources/CSVSource.php b/src/Objects/Sources/CSVSource.php
@@ -72,8 +72,8 @@ public function getFields()
 
     public function countDataRows()
     {
-        $file = new SplFileObject($this->file, 'r');
+        $file = new \SplFileObject($this->file, 'r');
         $file->seek(PHP_INT_MAX);
-        return $file->key() + 1;
+        return $file->key();
     }
 }
diff --git a/src/Objects/Sources/PDOSource.php b/src/Objects/Sources/PDOSource.php
@@ -130,12 +130,18 @@ public function getFields()
 
     public function countDataRows()
     {
-        $sql = $this->getSQL();
+        $sql = $this->getSQL([]);
         $fromPos = strpos($sql, 'from');
         $limitPos = strrpos($sql, 'limit');
         $sqlSuffix = substr($sql, $fromPos, $limitPos-$fromPos);
 
-        $sql = 'count (*) '.$sqlSuffix;
-        var_dump($sql); die;
+        $sql = 'select count(*) as countDataRows '.$sqlSuffix;
+
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute();
+
+        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+
+        return $row['countDataRows'];
     }
 }
diff --git a/src/Objects/Sources/WordPressPostSource.php b/src/Objects/Sources/WordPressPostSource.php
@@ -145,12 +145,11 @@ public function getFields()
 
     public function countDataRows()
     {
-        $sql = $this->getPostSQL();
+        $sql = $this->getPostSQL([]);
         $fromPos = strpos($sql, 'from');
         $limitPos = strrpos($sql, 'limit');
         $sqlSuffix = substr($sql, $fromPos, $limitPos-$fromPos);
 
         $sql = 'count (*) '.$sqlSuffix;
-        var_dump($sql); die;
     }
 }
diff --git a/src/Objects/Sources/WordPressUserSource.php b/src/Objects/Sources/WordPressUserSource.php
@@ -143,12 +143,11 @@ public function getFields()
 
     public function countDataRows()
     {
-        $sql = $this->getUserSQL();
+        $sql = $this->getUserSQL([]);
         $fromPos = strpos($sql, 'from');
         $limitPos = strrpos($sql, 'limit');
         $sqlSuffix = substr($sql, $fromPos, $limitPos-$fromPos);
 
         $sql = 'count (*) '.$sqlSuffix;
-        var_dump($sql); die;
     }
 }