Rework getFiltered, getTotal in PdoSource

rougin · Nov 17, 2024 · 564e646 · 564e646
1 parent d074f06
commit 564e646
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 123 deletions.
diff --git a/README.bak b/README.bak
diff --git a/README.md b/README.md
@@ -183,7 +183,8 @@ use Rougin\Datatables\Table;
 interface SourceInterface
 {
     /**
-     * Returns the total items after filter.
+     * Returns the total items after filter. If no filters
+     * are defined, the value should be same with getTotal.
      *
      * @return integer
      */

diff --git a/src/Source/PdoSource.php b/src/Source/PdoSource.php
@@ -48,33 +48,14 @@ public function __construct(\PDO $pdo)
     }
 
     /**
-     * TODO: If no filters, the value should be same with getTotal.
-     *
-     * Returns the total items after filter.
+     * Returns the total items after filter. If no filters
+     * are defined, the value should be same with getTotal.
      *
      * @return integer
      */
     public function getFiltered()
     {
-        // Reset values prior creating query ---
-        $this->values = array();
-        // -------------------------------------
-
-        $table = $this->table->getName() . ' ';
-
-        $query = 'SELECT COUNT(*) FROM ' . $table;
-
-        $query .= $this->setWhereQuery() . ' ';
-
-        /** @var \PDOStatement */
-        $stmt = $this->pdo->prepare($query);
-
-        $stmt->execute($this->values);
-
-        /** @var integer */
-        $total = $stmt->fetch(\PDO::FETCH_COLUMN);
-
-        return (int) $total;
+        return $this->getTotalItems(true);
     }
 
     /**
@@ -137,27 +118,13 @@ public function getItems()
     }
 
     /**
-     * TODO: Merge logic with getFiltered.
-     *
      * Returns the total items from the source.
      *
      * @return integer
      */
     public function getTotal()
     {
-        $table = $this->table->getName();
-
-        $query = 'SELECT COUNT(*) FROM ' . $table;
-
-        /** @var \PDOStatement */
-        $stmt = $this->pdo->prepare($query);
-
-        $stmt->execute();
-
-        /** @var integer */
-        $total = $stmt->fetch(\PDO::FETCH_COLUMN);
-
-        return (int) $total;
+        return $this->getTotalItems();
     }
 
     /**
@@ -188,6 +155,37 @@ public function setTable(Table $table)
         return $this;
     }
 
+    /**
+     * @param boolean $filter
+     *
+     * @return integer
+     */
+    protected function getTotalItems($filter = false)
+    {
+        // Reset values prior creating query ---
+        $this->values = array();
+        // -------------------------------------
+
+        $table = $this->table->getName() . ' ';
+
+        $query = 'SELECT COUNT(*) FROM ' . $table;
+
+        if ($filter)
+        {
+            $query .= $this->setWhereQuery() . ' ';
+        }
+
+        /** @var \PDOStatement */
+        $stmt = $this->pdo->prepare(trim($query));
+
+        $stmt->execute($this->values);
+
+        /** @var integer */
+        $total = $stmt->fetch(\PDO::FETCH_COLUMN);
+
+        return (int) $total;
+    }
+
     /**
      * @return string
      */

diff --git a/src/Source/SourceInterface.php b/src/Source/SourceInterface.php
@@ -13,7 +13,8 @@
 interface SourceInterface
 {
     /**
-     * Returns the total items after filter.
+     * Returns the total items after filter. If no filters
+     * are defined, the value should be same with getTotal.
      *
      * @return integer
      */