php errors resolved

CodesVault · Jul 25, 2023 · 35c5ccf · 35c5ccf
1 parent 8037d68
commit 35c5ccf
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 61 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "codesvault/howdy-qb",
     "description": "Mysql Query Builder for WordPress",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "minimum-stability": "stable",
     "scripts": {
         "test": "phpunit",

diff --git a/src/DB.php b/src/DB.php
@@ -12,7 +12,6 @@ class DB extends QueryFactory
 {
     public static function select(...$columns): SelectInterface
     {
-		dump(static::$driver);
         $factory = new self(static::$driver);
         $query = $factory->selectQuery();
         $query = $query->columns(...$columns);
@@ -21,7 +20,6 @@ public static function select(...$columns): SelectInterface
 
     public static function insert(string $table_name, array $data)
     {
-		dump(static::$driver);
         $factory = new self(static::$driver);
         $factory->insertQuery($table_name, $data);
         return $factory;

diff --git a/src/Statement/Alter.php b/src/Statement/Alter.php
@@ -175,7 +175,7 @@ public function getSql()
     private function driver_exicute($sql)
     {
         $driver = $this->db;
-        if ($driver instanceof \wpdb) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($sql);
         }
 

diff --git a/src/Statement/Create.php b/src/Statement/Create.php
@@ -20,11 +20,6 @@ public function __construct($db, string $table_name)
     {
         $this->db = $db;
         $this->table_name = $table_name;
-        $this->wpdb_object = QueryFactory::getConfig();
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            $this->wpdb_object = $wpdb;
-        }
 
         $this->start();
         $this->sql['table_name'] = $this->get_table_name();
@@ -139,7 +134,7 @@ public function default($value): self
 
     public function foreignKey(string $column, string $reference_table, string $reference_column): self
     {
-        $table_name = $this->wpdb_object->prefix . $reference_table;
+        $table_name = Utilities::get_db_configs()->prefix . $reference_table;
         $this->sql['foreignKey'] = "FOREIGN KEY ($column) REFERENCES $table_name ($reference_column)" ;
         return $this;
     }
@@ -151,7 +146,7 @@ protected function start()
 
     protected function get_table_name()
     {
-        return $this->wpdb_object->prefix . $this->table_name;
+        return Utilities::get_db_configs()->prefix . $this->table_name;
     }
 
     // get only sql query string
@@ -167,7 +162,7 @@ public function getSql()
     private function driver_exicute($sql)
     {
         $driver = $this->db;
-        if ($driver instanceof \wpdb) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($sql);
         }
 

diff --git a/src/Statement/Delete.php b/src/Statement/Delete.php
@@ -13,18 +13,11 @@ class Delete implements DeleteInterface
     public $sql = [];
     protected $params = [];
     protected $table_name;
-    protected $wpdb_object;
 
     public function __construct($db, string $table_name)
     {
-        $this->wpdb_object = QueryFactory::getConfig();
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            $this->wpdb_object = $wpdb;
-        }
-
         $this->db = $db;
-        $this->table_name = $this->wpdb_object->prefix . $table_name;
+        $this->table_name = Utilities::get_db_configs()->prefix . $table_name;
     }
 
     protected function start()
@@ -72,7 +65,7 @@ public function dropIfExists()
     private function driver_exicute($sql)
     {
         $driver = $this->db;
-        if ('wpdb' === QueryFactory::getDriver()) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($driver->prepare($sql, $this->params));
         }
 

diff --git a/src/Statement/Drop.php b/src/Statement/Drop.php
@@ -17,14 +17,8 @@ class Drop implements DropInterface
 
     public function __construct($db, string $table_name)
     {
-        $this->wpdb_object = QueryFactory::getConfig();
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            $this->wpdb_object = $wpdb;
-        }
-
         $this->db = $db;
-        $this->table_name = $this->wpdb_object->prefix . $table_name;
+        $this->table_name = Utilities::get_db_configs()->prefix . $table_name;
     }
 
     public function drop()
@@ -42,7 +36,7 @@ public function dropIfExists()
     private function driver_exicute($sql)
     {
         $driver = $this->db;
-        if ('wpdb' === QueryFactory::getDriver()) {
+		if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($sql);
         }
 

diff --git a/src/Statement/Insert.php b/src/Statement/Insert.php
@@ -44,9 +44,8 @@ private function insert_data()
 
     private function driver_exicute($sql)
     {
-		dump($sql, $this->params);
         $driver = $this->db;
-        if ($driver instanceof \wpdb) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($driver->prepare($sql, $this->params));
         }
 
@@ -61,18 +60,9 @@ private function start()
 
     private function get_table_name()
     {
-       return $this->getTablePrefix()->prefix . $this->table_name;
+       return Utilities::get_db_configs()->prefix . $this->table_name;
     }
 
-	private function getTablePrefix()
-	{
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            return $wpdb;
-        }
-		return QueryFactory::getConfig();
-	}
-
     private function get_columns()
     {
         if (empty($this->data)) return;

diff --git a/src/Statement/Select.php b/src/Statement/Select.php
@@ -14,17 +14,11 @@ class Select implements SelectInterface
     protected $sql = [];
     protected $params = [];
     protected $table_name;
-    protected $wpdb_object;
     private $raw_count = 0;
 
     public function __construct($db)
     {
         $this->db = $db;
-        $this->wpdb_object = QueryFactory::getConfig();
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            $this->wpdb_object = $wpdb;
-        }
     }
 
     protected function start()
@@ -71,7 +65,7 @@ public function alias(string $name): self
 
     public function from(string $table_name): self
     {
-        $this->sql['table_name'] = 'FROM ' . $this->wpdb_object->prefix . $table_name;
+        $this->sql['table_name'] = 'FROM ' . Utilities::get_db_configs()->prefix . $table_name;
         return $this;
     }
 
@@ -158,10 +152,10 @@ private function setJoin($table_name, string $col1 = null, string $col2 = null,
         $table_names = [];
         if (is_array($table_name)) {
             foreach ($table_name as $table) {
-                $table_names[] = $this->wpdb_object->prefix . $table;
+                $table_names[] = Utilities::get_db_configs()->prefix . $table;
             }
         } else {
-            $table_names[] = $this->wpdb_object->prefix . $table_name;
+            $table_names[] = Utilities::get_db_configs()->prefix . $table_name;
         }
 
         $table = '';
@@ -224,7 +218,7 @@ private function fetch($query, array $args = [])
     private function driver_exicute($sql, $placeholders)
     {
         $driver = $this->db;
-        if ($driver instanceof \wpdb) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             if (empty($placeholders)) {
                 return $driver->get_results($sql, ARRAY_A);
             }

diff --git a/src/Statement/Update.php b/src/Statement/Update.php
@@ -14,26 +14,20 @@ class Update implements UpdateInterface
     public $sql = [];
     protected $params = [];
     protected $table_name;
-    protected $wpdb_object;
 
     public function __construct($db, string $table_name, array $data)
     {
-        $this->wpdb_object = QueryFactory::getConfig();
-        if (empty(QueryFactory::getConfig())) {
-            global $wpdb;
-            $this->wpdb_object = $wpdb;
-        }
+		$this->db = $db;
 
-        $this->db = $db;
         $this->data = $data;
-        $this->table_name = $this->wpdb_object->prefix . $table_name;
+        $this->table_name = $this->get_table_prefix()->prefix . $table_name;
         $this->sql['set_columns'] = $this->set_columns();
     }
 
     private function driver_exicute($sql)
     {
         $driver = $this->db;
-        if ('wpdb' === QueryFactory::getDriver()) {
+        if (class_exists('wpdb') && $driver instanceof \wpdb) {
             return $driver->query($driver->prepare($sql, $this->params));
         }
 
@@ -69,6 +63,15 @@ public function getSql()
         return $query;
     }
 
+	private function get_table_prefix()
+	{
+        if (empty(QueryFactory::getConfig())) {
+            global $wpdb;
+            return $wpdb;
+        }
+		return QueryFactory::getConfig();
+	}
+
     protected function start()
     {
         $this->sql['start'] = 'UPDATE ' . $this->table_name;
@@ -92,7 +95,7 @@ public function where($column, string $operator = null, $value = null): self
             call_user_func( $column, $this );
             return $this;
         }
-        $this->sql['where'] = 'WHERE ' . $column . ' ' . $operator . ' ' . Utilities::get_placeholder();
+        $this->sql['where'] = 'WHERE ' . $column . ' ' . $operator . ' ' . Utilities::get_placeholder($this->db, $value);
         $this->params[] = $value;
         return $this;
     }

diff --git a/src/Utilities.php b/src/Utilities.php
@@ -33,4 +33,13 @@ public static function get_placeholder($db, $value)
         }
         return "?";
     }
+
+	public static function get_db_configs()
+	{
+        if (empty(QueryFactory::getConfig())) {
+            global $wpdb;
+            return $wpdb;
+        }
+		return QueryFactory::getConfig();
+	}
 }