Update DB.php

Author: riverside

src/DB.php

@@ -21,12 +21,12 @@ class DB
 
     private $params = array();
 
-    protected $pk = null;
-    
     private $rowCount = null;
 
     private $select = null;
 
+    private $sth = null;
+    
     protected $table = null;
 
     private $where = array();
@@ -102,14 +102,10 @@ protected function buildWhere(): string
                 $tmp[] = sprintf("%s %s %s",
                     $item['column'],
                     $item['operator'],
-                    ":where_$i"
-                    /*$item['value'] instanceof Expression
-                        ? $item['value']
-                        : "'" . $item['value'] . "'"*/);
+                    ":where_$i");
                 $this->param(":where_$i", $item['value']);
             } else {
                 $tmp[] = $item['value'];
-                //$tmp[] = ":where_$i";
             }            
 
             $i += 1;
@@ -167,28 +163,17 @@ public function count(): ?int
 
         $statement .= " LIMIT 1;";
 
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($statement))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
-        {
-            return false;
-        }
-        
-        if ($this->debug)
-        {
-            echo '<pre>';
-            $sth->debugDumpParams();
-            echo '</pre>';
-        }
+        $this->dump();
 
-        return $sth->fetchColumn();
+        return $this->sth->fetchColumn();
     }
 
-    public function debug(bool $value=null): DB
+    public function debug(bool $value): DB
     {
         $this->debug = $value;
 
@@ -225,103 +210,79 @@ public function delete($modifiers=null): ?int
             $statement .= sprintf(" LIMIT %u;", $this->rowCount);
         }
 
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($statement))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
-        {
-            return false;
-        }
+        $this->dump();
 
+        return $this->sth->rowCount();
+    }
+
+    protected function dump()
+    {
         if ($this->debug)
         {
             echo '<pre>';
-            $sth->debugDumpParams();
+            $this->sth->debugDumpParams();
             echo '</pre>';
         }
-        
-        return $sth->rowCount();
     }
-      
+
     public function find($value): ?array
     {
-        $this->where($this->pk, $value);
+        $this->where('id', $value);
         $this->limit(1, 0);
 
-        $statement = $this->buildSelect();
-        
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($this->buildSelect()))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
+        $this->dump();
+        
+        return $this->sth->fetch(\PDO::FETCH_ASSOC);
+    }
+
+    protected function fire(string $statement): bool
+    {
+        $this->sth = $this->dbh->prepare($statement);
+        if (!$this->sth)
         {
             return false;
         }
 
-        if ($this->debug)
+        if (!$this->sth->execute($this->params))
         {
-            echo '<pre>';
-            $sth->debugDumpParams();
-            echo '</pre>';
+            return false;
         }
 
-        return $sth->fetch(\PDO::FETCH_ASSOC);
+        return true;
     }
 
     public function first(): ?array
     {
-        $statement = $this->buildSelect();
-        
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
-        {
-            return false;
-        }
-        
-        if (!$sth->execute($this->params))
+        if (!$this->fire($this->buildSelect()))
         {
             return false;
         }
 
-        if ($this->debug)
-        {
-            echo '<pre>';
-            $sth->debugDumpParams();
-            echo '</pre>';
-        }
+        $this->dump();
 
-        return $sth->fetch(\PDO::FETCH_ASSOC);
+        return $this->sth->fetch(\PDO::FETCH_ASSOC);
     }
 
     public function get(): ?array
     {
-        $statement = $this->buildSelect();
-        
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($this->buildSelect()))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
-        {
-            return false;
-        }
-        
-        if ($this->debug)
-        {
-            echo '<pre>';
-            $sth->debugDumpParams();
-            echo '</pre>';
-        }
+        $this->dump();
 
-        return $sth->fetchAll(\PDO::FETCH_ASSOC);
+        return $this->sth->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     public function groupBy(string $value=null): DB
@@ -369,18 +330,12 @@ public function insert(array $data, $modifiers=null): ?int
 
         $statement .= " SET " . join(", ", $tmp);
 
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($statement))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
-        {
-            return false;
-        }
-        
-        return $sth->rowCount()
+        return $this->sth->rowCount()
             ? $this->dbh->lastInsertId()
             : false;
     }
@@ -457,6 +412,7 @@ public function reset(): DB
         $this->params   = array();
         $this->rowCount = null;
         $this->select   = null;
+        $this->sth      = null;
         $this->where    = array();
 
         return $this;
@@ -469,13 +425,11 @@ public function select(string $value=null): DB
         return $this;
     }
 
-    public static function table(string $value): DB
+    public function table(string $value): DB
     {
-        $inst = new self();
-        
-        $inst->table = $value;
+        $this->table = $value;
 
-        return $inst;
+        return $this;
     }
 
     public function truncate(): bool
@@ -533,27 +487,27 @@ public function update(array $data, $modifiers=null): int
             $statement .= sprintf(" LIMIT %u;", $this->rowCount);
         }
 
-        $sth = $this->dbh->prepare($statement);
-        if (!$sth)
+        if (!$this->fire($statement))
         {
             return false;
         }
 
-        if (!$sth->execute($this->params))
-        {
-            return false;
-        }
+        $this->dump();
 
-        if ($this->debug)
-        {
-            echo '<pre>';
-            $sth->debugDumpParams();
-            echo '</pre>';
+        return $this->sth->rowCount();
         }
 
-        return $sth->rowCount();
+    public function value(string $column): string
+    {
+        $row = $this->first();
+        if (!$row)
+        {
+            return false;
     }
-        
+
+        return array_key_exists($column, $row) ? $row[$column] : NULL;
+    }
+
     public function where(): DB
     {
         switch (func_num_args())
@@ -573,6 +527,10 @@ public function where(): DB
                 $operator = func_get_arg(1);
                 $value    = func_get_arg(2);
                 break;
+            default:
+                $column   = null;
+                $operator = null;
+                $value    = null;
         }
 
         $this->where[] = array(