Add PostgreSQL handler

Add new handler and interfaces

Author: danielRConsid

AbstractDB.php

@@ -33,6 +33,7 @@ abstract class AbstractDB implements DBInterface
     protected $fkData;
     protected $joinedTables;
 
+    protected string $connKey = "default";
 
     /**
      * Build SELECT sql code (The method will be auto called in method build)
@@ -84,13 +85,21 @@ abstract protected function dropView(): self;
      */
     abstract protected function showView(): self;
 
+    public function setConnKey(?string $key) {
+        $this->connKey = is_null($key) ? "default" : $key;
+    }
+    
+    public function connInst() {
+        return Connect::getInstance($this->connKey);
+    }
+    
     /**
      * Access Mysql DB connection
      * @return \mysqli
      */
     public function connect()
     {
-        return Connect::getInstance()->DB();
+        return $this->connInst()->DB();
     }
 
     /**
@@ -100,7 +109,7 @@ public function connect()
     public function getTable(bool $withAlias = false): string
     {
         $alias = ($withAlias && !is_null($this->alias)) ? " {$this->alias}" : "";
-        return Connect::getInstance()->getHandler()->getPrefix() . $this->table . $alias;
+        return $this->connInst()->getHandler()->getPrefix() . $this->table . $alias;
     }
 
     /**
@@ -361,7 +370,7 @@ final protected function extractCamelCase(string $value): array
     final protected function buildJoinFromMig(MigrateInterface $mig, string $type): array
     {
         $joinArr = array();
-        $prefix = Connect::getInstance()->getHandler()->getPrefix();
+        $prefix = $this->connInst()->getHandler()->getPrefix();
         $main = $this->getMainFKData();
         $data = $mig->getData();
         $this->mig->mergeData($data);
@@ -391,7 +400,6 @@ final protected function buildJoinFromMig(MigrateInterface $mig, string $type):
         return $joinArr;
     }
 
-
     /**
      * Build on YB to col sql string part
      * @return string|null
@@ -416,7 +424,7 @@ protected function getAllQueryTables(): ?string
      */
     final protected function query(string|self $sql, ?string $method = null, array $args = []): array|object|bool|string
     {
-        $query = new Query($sql);
+        $query = new Query($sql, $this->connInst());
         $query->setPluck($this->pluck);
         if (!is_null($method)) {
             if (method_exists($query, $method)) {

Connect.php

@@ -3,20 +3,22 @@
 
 namespace MaplePHP\Query;
 
+use InvalidArgumentException;
 use MaplePHP\Query\Exceptions\ConnectException;
 use MaplePHP\Query\Interfaces\AttrInterface;
 use MaplePHP\Query\Interfaces\MigrateInterface;
 use MaplePHP\Query\Utility\Attr;
 use mysqli;
 
 /**
- * @method static select(string $string, string|array|MigrateInterface $array)
+ * @method static select(string $columns, string|array|MigrateInterface $table)
  * @method static table(string $string)
  */
 class Connect
 {
     private $handler;
     private static array $inst;
+    public static string $current = "default";
     private $db;
 
     private function __construct($handler)
@@ -32,14 +34,15 @@ private function __clone() {
     }
 
     /**
-     * Access query builder intance
+     * Access query builder instance
      * @param string $name
      * @param array $arguments
      * @return mixed
      */
     public static function __callStatic(string $name, array $arguments)
     {
         $inst = new DB();
+        $inst->setConnKey(self::$current);
         return $inst::$name(...$arguments);
     }
 
@@ -52,12 +55,32 @@ public static function __callStatic(string $name, array $arguments)
     public static function setHandler($handler, ?string $key = null): self
     {
         $key = self::getKey($key);
-        if(!self::hasInstance($key)) {
-            self::$inst[$key] = new self($handler);
+        if(self::hasInstance($key)) {
+            throw new InvalidArgumentException("A handler is already connected with key \"$key\"!");
         }
+        self::$inst[$key] = new self($handler);
         return self::$inst[$key];
     }
 
+    /**
+     * Remove a handler
+     * @param string $key
+     * @return void
+     */
+    public static function removeHandler(string $key): void
+    {
+        if($key === "default") {
+            throw new InvalidArgumentException("You can not remove the default handler!");
+        }
+        if(!self::hasInstance($key)) {
+            throw new InvalidArgumentException("The handler with with key \"$key\" does not exist!");
+        }
+        unset(self::$inst[$key]);
+        if(self::$current === $key) {
+            self::$current = "default";
+        }
+    }
+
     /**
      * Get default instance or secondary instances with key
      * @param string|null $key
@@ -68,9 +91,9 @@ public static function getInstance(?string $key = null): self
     {
         $key = self::getKey($key);
         if(!self::hasInstance($key)) {
-            throw new ConnectException("Connect Error: No Connection Found");
+            throw new ConnectException("Connection Error: No active connection or connection instance found.");
         }
-
+        self::$current = $key;
         return self::$inst[$key];
     }
 

DB.php

@@ -35,6 +35,7 @@ class DB extends AbstractDB
     private $viewName;
     private $sql;
     private $dynamic;
+    private ?string $returning = null;
     protected ?string $pluck = null;
 
     /**
@@ -52,7 +53,9 @@ public static function __callStatic(string $method, array $args)
             $table = array_pop($args);
             $inst = self::table($table);
             $inst->method = $method;
-            $prefix = Connect::getInstance()->getHandler()->getPrefix();
+            $inst->setConnKey(Connect::$current);
+            $prefix = Connect::getInstance(Connect::$current)->getHandler()->getPrefix();
+
             switch ($inst->method) {
                 case 'select':
                 case 'selectView':
@@ -77,9 +80,11 @@ public static function __callStatic(string $method, array $args)
                     $inst->dynamic = [[$inst, $inst->method], $args];
                     break;
             }
+
         } else {
             $inst = new self();
         }
+
         return $inst;
     }
 
@@ -151,6 +156,8 @@ public static function table(string|array|MigrateInterface $data): self
         $inst->alias = $data['alias'];
         $inst->table = $inst->getAttr($data['table'])->enclose(false);
         $inst->mig = $mig;
+        $inst->setConnKey(Connect::$current);
+
         if (is_null($inst->alias)) {
             $inst->alias = $inst->table;
         }
@@ -179,10 +186,6 @@ public static function withAttr(array|string|int|float $value, ?array $args = nu
         return $inst;
     }
 
-    static function _select($col, $table) {
-        return self::table($table)->columns($col);
-    }
-
     /**
      * Build SELECT sql code (The method will be auto called in method build)
      * @method static __callStatic
@@ -197,10 +200,8 @@ protected function select(): self
         $having = $this->buildWhere("HAVING", $this->having);
         $order = (!is_null($this->order)) ? " ORDER BY " . implode(",", $this->order) : "";
         $limit = $this->buildLimit();
-
         $this->sql = "{$this->explain}SELECT $this->noCache$this->calRows$this->distinct$columns FROM " .
         $this->getTable(true) . "$join$where$this->group$having$order$limit$this->union";
-
         return $this;
     }
 
@@ -221,7 +222,7 @@ protected function selectView(): self
     protected function insert(): self
     {
         $this->sql = "{$this->explain}INSERT INTO " . $this->getTable() . " " .
-        $this->buildInsertSet() . $this->buildDuplicate();
+        $this->buildInsertSet() . $this->buildDuplicate() . $this->buildReturning();
         return $this;
     }
 
@@ -236,7 +237,7 @@ protected function update(): self
         $limit = $this->buildLimit();
 
         $this->sql = "{$this->explain}UPDATE " . $this->getTable() . "$join SET " .
-        $this->buildUpdateSet() . "$where$limit}";
+        $this->buildUpdateSet() . "$where$limit}"  . $this->buildReturning();
         return $this;
     }
 
@@ -526,6 +527,17 @@ public function group(...$columns): self
         return $this;
     }
 
+    /**
+     * Postgre specific function
+     * @param string $column
+     * @return $this
+     */
+    public function returning(string $column): self
+    {
+        $this->returning = (string)$this->prep($column);
+        return $this;
+    }
+
     /**
      * Mysql JOIN query (Default: INNER)
      * @param string|array|MigrateInterface $table Mysql table name (if array e.g. [TABLE_NAME, ALIAS]) or MigrateInterface instance
@@ -550,7 +562,7 @@ public function join(
                 throw new DBQueryException("You need to specify the argument 2 (where) value!", 1);
             }
 
-            $prefix = Connect::getInstance()->getHandler()->getPrefix();
+            $prefix = $this->connInst()->getHandler()->getPrefix();
             $arr = $this->sperateAlias($table);
             $table = (string)$this->prep($arr['table'], false);
             $alias = (!is_null($arr['alias'])) ? " {$arr['alias']}" : " $table";
@@ -737,6 +749,19 @@ private function buildUpdateSet(?array $arr = null): string
         return implode(",", $new);
     }
 
+    /**
+     * Will build a returning value that can be fetched with insert id
+     * This is a PostgreSQL specific function.
+     * @return string
+     */
+    private function buildReturning(): string
+    {
+        if(!is_null($this->returning) && $this->connInst()->getHandler()->getType() === "postgresql") {
+            return " RETURNING $this->returning";
+        }
+        return "";
+    }
+
     /**
      * Build on duplicate sql string part
      * @return string
@@ -797,7 +822,7 @@ private function buildLimit(): string
 
     /**
      * Used to call method that builds SQL queries
-     * @throws DBQueryException
+     * @throws DBQueryException|DBValidationException
      */
     final protected function build(): void
     {
@@ -816,50 +841,30 @@ final protected function build(): void
     /**
      * Generate SQL string of current instance/query
      * @return string
-     * @throws DBQueryException
+     * @throws DBQueryException|DBValidationException
      */
     public function sql(): string
     {
         $this->build();
         return $this->sql;
     }
 
-    /**
-     * Start Transaction
-     * @return mixed
-     * @throws ConnectException
-     */
-    public static function transaction(): mixed
-    {
-        return Connect::getInstance()->getHandler()->transaction();
-    }
-
-    /**
-     * Get return a new generated UUID
-     * DEPRECATED: Will be moved to Connect for starter
-     * @throws ConnectException|DBQueryException
-     */
-    public static function getUUID(): ?string
-    {
-        $result = Connect::getInstance()->query("SELECT UUID()");
-        if (is_object($result)) {
-            if ($result->num_rows > 0) {
-                $row = $result->fetch_row();
-                return ($row[0] ?? null);
-            }
-            return null;
-        } else {
-            throw new DBQueryException(Connect::getInstance()->DB()->error, 1);
-        }
-    }
-
     /**
      * Get insert AI ID from prev inserted result
      * @return int|string
-     * @throws ConnectException
+     * @throws ConnectException|DBQueryException
      */
     public function insertID(): int|string
     {
-        return Connect::getInstance()->DB()->insert_id;
+        if($this->connInst()->getHandler()->getType() === "postgresql") {
+            if(is_null($this->returning)) {
+                throw new DBQueryException("You need to specify the returning column when using PostgreSQL.");
+            }
+            return $this->connInst()->DB()->insert_id($this->returning);
+        }
+        if($this->connInst()->getHandler()->getType() === "sqlite") {
+            return $this->connInst()->DB()->lastInsertRowID();
+        }
+        return $this->connInst()->DB()->insert_id;
     }
 }