Query Method Added

Author: Fredrick Peter

README.md

@@ -60,6 +60,7 @@ was pretty tough. So i decided to create a much more easier way of communicating
     * [Get Pagination](#get-pagination)
 * [Clause](#clause)
   * [Raw](#raw)
+  * [Query](#query)
   * [select](#select)
   * [selectRaw](#selectRaw)
   * [orderBy](#orderby)
@@ -118,7 +119,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/database": "^4.3.1"
+    "peterson/database": "^4.3.2"
 }
 ```
 
@@ -720,6 +721,15 @@ $db->table("tb_wallet")
     ->get();
 ```
 
+### Query
+- Allows the use direct sql query `SQL query syntax`
+
+```
+$db->query("SHOW COLUMNS FROM users")
+    ->limit(10)
+    ->get();
+```
+
 ### Select
 - Used to select needed columns from database
 

composer.json

@@ -22,6 +22,9 @@
         "filp/whoops": "^2.15",
         "symfony/var-dumper": "^5.4.3"
     },
+    "conflict": {
+        "symfony/var-dumper": ">=6.0.0"
+    },
     "autoload": {
         "files": [
             "src/helpers.php"

src/Connectors/Connector.php

@@ -71,6 +71,17 @@ public function tableExists(?string $table)
         return $this->table('')->tableExists($table);
     }
 
+    /**
+     * Direct Query Expression
+     * 
+     * @param string $query
+     * @return \builder\Database\Schema\Builder
+     */ 
+    public function query(string $query)
+    {
+        return $this->table('')->query($query);
+    }
+
     /**
      * Configuring pagination settings 
      * @param array $options
@@ -158,21 +169,6 @@ public function dbConnection()
         ]);
     }
 
-    /**
-     * Query method uses default connection only.
-     * or you can use [connection('connName')->getPDO()->query()]
-     * 
-     * @param string $query\Raw sql query string
-     * 
-     * @return $this
-     * The PDO instance or null if the connection is not established.
-     */
-    public function query($query)
-    {
-        $pdo = $this->getPDO();
-        return !is_null($pdo) ? $pdo->query($query) : $pdo;
-    }
-
     /**
      * Get the PDO instance for the current database driver.
      *

src/Migrations/Schema.php

@@ -22,6 +22,14 @@ class Schema{
      * @var object\builder\Database\DB
      */
     private static $db;
+    
+    /**
+     * Instance of Database Object
+     *
+     * @var mixed
+     */
+    private static $pdo;
+
 
     /**
      * Creating Instance of Database
@@ -31,6 +39,7 @@ class Schema{
     private static function initSchemaDatabase() 
     {
         self::$db = DB::connection();
+        self::$pdo = self::$db->getPDO();
     }
 
     /**
@@ -98,7 +107,7 @@ public static function updateColumnDefaultValue(?string $table, ?string $column,
             $formatValue  = self::formatDefaultValue($value);
 
             // Get the current column definition
-            $stmt   = self::$db->query("DESCRIBE {$table} {$column}");
+            $stmt       = self::$pdo->query("DESCRIBE {$table} {$column}");
             $columnInfo = $stmt->execute()->fetch(PDO::FETCH_ASSOC);
 
             // Extract the column type, nullability, and constraints
@@ -122,7 +131,7 @@ public static function updateColumnDefaultValue(?string $table, ?string $column,
             }
 
             // execute query
-            self::$db->query($query)->execute();
+            self::$pdo->query($query)->execute();
 
             return [
                 'status'    => Constant::STATUS_200,
@@ -163,12 +172,11 @@ public static function dropTable(?string $tableName, $force = false)
         try{
             // DROP TABLE IF EXISTS
             if($force){
-                $pdo = self::$db->getPDO();
-                $pdo->exec("SET FOREIGN_KEY_CHECKS = 0; "); // Disable foreign key checks temporarily
-                $pdo->exec("DROP TABLE {$tableName} CASCADE;"); // Drop the table with CASCADE option
-                $pdo->exec("SET FOREIGN_KEY_CHECKS = 1;"); // Enable foreign key checks again
+                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 0; "); // Disable foreign key checks temporarily
+                self::$pdo->exec("DROP TABLE {$tableName} CASCADE;"); // Drop the table with CASCADE option
+                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 1;"); // Enable foreign key checks again
             } else{
-                self::$db->query( "DROP TABLE {$tableName};" )->execute();
+                self::$pdo->query( "DROP TABLE {$tableName};" )->execute();
             }
 
             return [
@@ -217,13 +225,13 @@ public static function dropColumn(?string $tableName, ?string $columnName)
         // Handle query
         try{
             // DROP COLUMN IF EXISTS
-            self::$db->query( "ALTER TABLE {$tableName} DROP COLUMN {$columnName};" )->execute();
+            self::$pdo->query( "ALTER TABLE {$tableName} DROP COLUMN {$columnName};" )->execute();
 
             // DROP COLUMN TRIGGERS 
-            self::$db->query( "DROP TRIGGER IF EXISTS {$columnName}_created_at;" )->execute();
+            self::$pdo->query( "DROP TRIGGER IF EXISTS {$columnName}_created_at;" )->execute();
 
             // DROP COLUMN TRIGGERS 
-            self::$db->query( "DROP TRIGGER IF EXISTS {$columnName}_updated_at;" )->execute();
+            self::$pdo->query( "DROP TRIGGER IF EXISTS {$columnName}_updated_at;" )->execute();
 
             return [
                 'status'    => Constant::STATUS_200,

src/Schema/Builder.php

@@ -46,6 +46,19 @@ public function from($table, $as = null)
         return $this;
     }
 
+    /**
+     * Direct Query Expression
+     * 
+     * @param string $query
+     * @return $this
+     */ 
+    public function query(string $query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
     /**
      * Columns to be selected.
      * 

src/Schema/Traits/BuilderTrait.php

@@ -885,6 +885,11 @@ protected function statement($query, $bindings = [], $ignore = false)
         $pdo = $this->connection->pdo;
 
         try {
+            // checking if global query is used
+            if(!empty($this->query)){
+                $query = $this->query;
+            }
+
             $statement = $pdo->prepare($query);
             $this->bindValues(
                 $statement, 
@@ -898,6 +903,7 @@ protected function statement($query, $bindings = [], $ignore = false)
         }
 
         $this->connection->statement = $statement ?? null;
+        $this->query = null;
 
         return $this;
     }
@@ -1340,6 +1346,7 @@ protected function close($table = true)
         $this->wheres   = [];
         $this->columns  = null;
         $this->method   = null;
+        $this->query    = null;
         $this->joins    = null;
         $this->orders   = null;
         $this->havings  = null;
@@ -1348,7 +1355,7 @@ protected function close($table = true)
         $this->offset   = null;
         $this->runtime  = 0.00;
         if($table){
-            $this->from     = null;
+            $this->from = null;
         }
     }
 
@@ -1392,7 +1399,5 @@ protected function errorException(mixed $exception)
         exit(1);
     }
 
-}
-
-
+} 
 

src/Schema/Traits/MySqlProperties.php

@@ -30,6 +30,11 @@ trait MySqlProperties{
      * @var string
      */
     public $method;
+
+    /**
+     * @var string
+     */
+    public $query;
 
     /**
      * The current query value bindings.