Add handler support

Author: CreativeWaDev

AbstractDB.php

@@ -3,8 +3,8 @@
 
 namespace MaplePHP\Query;
 
+use MaplePHP\Query\Exceptions\ConnectException;
 use MaplePHP\Query\Utility\Attr;
-use MaplePHP\Query\Handlers\MySqliHandler;
 use MaplePHP\Query\Interfaces\AttrInterface;
 use MaplePHP\Query\Interfaces\MigrateInterface;
 use MaplePHP\Query\Interfaces\DBInterface;
@@ -284,7 +284,8 @@ final protected function getMainFKData(): array
 
     /**
      * Mysql Prep/protect string
-     * @param  mixed $val
+     * @param mixed $val
+     * @param bool $enclose
      * @return AttrInterface
      */
     final protected function prep(mixed $val, bool $enclose = true): AttrInterface
@@ -347,15 +348,15 @@ final protected function camelLoop(array $camelCaseArr, array $valArr, callable
      */
     final protected function extractCamelCase(string $value): array
     {
-        $arr = preg_split('#([A-Z][^A-Z]*)#', $value, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        return $arr;
+        return preg_split('#([A-Z][^A-Z]*)#', $value, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
     }
 
     /**
      * Build join data from Migrate data
-     * @param  MigrateInterface $mig
-     * @param  string           $type Join type (INNER, LEFT, ...)
+     * @param MigrateInterface $mig
+     * @param string $type Join type (INNER, LEFT, ...)
      * @return array
+     * @throws ConnectException
      */
     final protected function buildJoinFromMig(MigrateInterface $mig, string $type): array
     {
@@ -370,16 +371,16 @@ final protected function buildJoinFromMig(MigrateInterface $mig, string $type):
             if (isset($row['fk'])) {
                 foreach ($row['fk'] as $a) {
                     if ($a['table'] === (string)$this->table) {
-                        $joinArr[] = "{$type} JOIN " . $prefix . $migTable . " " . $migTable .
-                        " ON (" . $migTable . ".{$col} = {$a['table']}.{$a['column']})";
+                        $joinArr[] = "$type JOIN " . $prefix . $migTable . " " . $migTable .
+                        " ON (" . $migTable . ".$col = {$a['table']}.{$a['column']})";
                     }
                 }
             } else {
                 foreach ($main as $c => $a) {
                     foreach ($a as $t => $d) {
                         if (in_array($col, $d)) {
-                            $joinArr[] = "{$type} JOIN " . $prefix . $migTable . " " . $migTable .
-                            " ON ({$t}.{$col} = {$this->alias}.{$c})";
+                            $joinArr[] = "$type JOIN " . $prefix . $migTable . " " . $migTable .
+                            " ON ($t.$col = $this->alias.$c)";
                         }
                     }
                 }
@@ -407,19 +408,21 @@ protected function getAllQueryTables(): ?string
 
     /**
      * Query result
-     * @param  string|self $sql
-     * @param  string|null $method
-     * @param  array $args
-     * @return array|object|bool
+     * @param string|self $sql
+     * @param string|null $method
+     * @param array $args
+     * @return array|object|bool|string
+     * @throws DBQueryException
      */
-    final protected function query(string|self $sql, ?string $method = null, array $args = []): array|object|bool
+    final protected function query(string|self $sql, ?string $method = null, array $args = []): array|object|bool|string
     {
         $query = new Query($sql);
+        $query->setPluck($this->pluck);
         if (!is_null($method)) {
             if (method_exists($query, $method)) {
                 return call_user_func_array([$query, $method], $args);
             }
-            throw new DBQueryException("Method \"{$method}\" does not exists!", 1);
+            throw new DBQueryException("Method \"$method\" does not exists!", 1);
         }
         return $query;
     }

Connect.php

@@ -5,12 +5,16 @@
 
 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 table(string $string)
+ */
 class Connect
 {
-
     private $handler;
     private static array $inst;
     private $db;
@@ -27,12 +31,24 @@ private function __construct($handler)
     private function __clone() {
     }
 
+    /**
+     * Access query builder intance
+     * @param string $name
+     * @param array $arguments
+     * @return mixed
+     */
     public static function __callStatic(string $name, array $arguments)
     {
         $inst = new DB();
         return $inst::$name(...$arguments);
     }
 
+    /**
+     * Set connection handler
+     * @param $handler
+     * @param string|null $key
+     * @return self
+     */
     public static function setHandler($handler, ?string $key = null): self
     {
         $key = self::getKey($key);
@@ -42,6 +58,12 @@ public static function setHandler($handler, ?string $key = null): self
         return self::$inst[$key];
     }
 
+    /**
+     * Get default instance or secondary instances with key
+     * @param string|null $key
+     * @return self
+     * @throws ConnectException
+     */
     public static function getInstance(?string $key = null): self
     {
         $key = self::getKey($key);
@@ -52,18 +74,32 @@ public static function getInstance(?string $key = null): self
         return self::$inst[$key];
     }
 
-    private static function hasInstance(?string $key = null): bool
+    /**
+     * Check if default instance or secondary instances exist for key
+     * @param string|null $key
+     * @return bool
+     */
+    public static function hasInstance(?string $key = null): bool
     {
         $key = self::getKey($key);
         return (isset(self::$inst[$key]) && (self::$inst[$key] instanceof self));
     }
 
+    /**
+     * Get the possible connection key
+     * @param string|null $key
+     * @return string
+     */
     private static function getKey(?string $key = null): string
     {
         $key = (is_null($key)) ? "default" : $key;
         return $key;
     }
 
+    /**
+     * Access the connection handler
+     * @return mixed
+     */
     function getHandler() {
         return $this->handler;
     }
@@ -85,6 +121,15 @@ public function getPrefix(): string
         return $this->handler->getPrefix();
     }
 
+    /**
+     * Check if a connections is open
+     * @return bool
+     */
+    public function hasConnection(): bool
+    {
+        return $this->handler->hasConnection();
+    }
+
     /**
      * Connect to database
      * @return void

Create.php

@@ -912,7 +912,7 @@ public function fkExists(string $table, string $col)
     {
         $table = Connect::getInstance()->prep($table);
         $col = Connect::getInstance()->prep($col);
-        $dbName = Connect::getInstance()->getDBName();
+        $dbName = Connect::getInstance()->getHandler()->getDBName();
         $result = Connect::getInstance()->query("SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM " .
             "INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '{$dbName}' AND " .
             "TABLE_NAME = '{$table}' AND COLUMN_NAME = '{$col}'");