refactor query, and bug fix query_prepared methods, now queryResult correctly returns last result objects under all SQL vendors., update tests

Author: TheTechsTech

README.md

@@ -207,8 +207,6 @@ foreach ($result as $row) {
 }
 ```
 
->Note: `query_prepared()` example works correctly for MySQL, the other drivers will return full query result statement. Will not be stored in `last_result`.
-
 ## For Authors and **[Contributors](https://github.com/ezSQL/ezsql/blob/master/CONTRIBUTORS.md)**
 
 ## Contributing

lib/Constants.php

@@ -5,7 +5,7 @@
     /**
     * ezsqlModel Constants
     */
-    \defined('EZSQL_VERSION') or \define('EZSQL_VERSION', '4.0.0');
+    \defined('EZSQL_VERSION') or \define('EZSQL_VERSION', '4.0.4');
     \defined('OBJECT') or \define('OBJECT', 'OBJECT');
     \defined('ARRAY_A') or \define('ARRAY_A', 'ARRAY_A');
     \defined('ARRAY_N') or \define('ARRAY_N', 'ARRAY_N');

lib/Database/ez_mysqli.php

@@ -9,7 +9,11 @@
 use ezsql\DatabaseInterface;
 
 class ez_mysqli extends ezsqlModel implements DatabaseInterface
-{
+{    
+    private $return_val = 0;
+    private $is_insert = false;
+    private $shortcutUsed = false;
+
     /**
     * Database connection handle 
     * @var resource
@@ -297,62 +301,23 @@ function ($string, &$arg) use (&$params) {
 
         return $result;
     }
-    
+
     /**
-     * Perform mySQL query and try to determine result value
+     * Perform post processing on SQL query call
      *
      * @param string $query
-     * @param bool $use_prepare
-     * @return mixed|bool
+     * @param mixed $result
+     * @return bool|void
      */
-    public function query(string $query, bool $use_prepare = false)
+    private function processQueryResult(string $query, $result = null)  
     {
-        $param = [];
-        if ($use_prepare)
-            $param = $this->prepareValues();
-        
-		// check for ezQuery placeholder tag and replace tags with proper prepare tag
-		$query = \str_replace(\_TAG, '?', $query);
-		
-        // Initialize return
-        $return_val = 0;
-
-        // Flush cached values..
-        $this->flush();
-
-        // For reg expressions
-        $query = \trim($query);
-
-        // Log how the function was called
-        $this->log_query("\$db->query(\"$query\")");
-
-        // Keep track of the last query for debug..
-        $this->last_query = $query;
+        $this->shortcutUsed = false;
 
-        // Count how many queries there have been
-        $this->num_queries++;
-
-        // Use core file cache function
-        if ( $cache = $this->get_cache($query) ) {
-            return $cache;
-        }
-
-        // If there is no existing database connection then try to connect
-        if ( ! isset($this->dbh) || ! $this->dbh ) {
-            $this->connect($this->database->getUser(), $this->database->getPassword(), $this->database->getHost());
-            $this->select($this->database->getName());
-        }
-
-        // Perform the query via std mysql_query function..
-		if (!empty($param) && \is_array($param) && ($this->isPrepareOn())) {
-            return $this->query_prepared($query, $param);
-        }
-        
-        $this->result = \mysqli_query($this->dbh, $query);
+        if (!empty($result))
+            $this->result = $result;
 
         // If there is an error then take note of it..
         if ( $str = \mysqli_error($this->dbh) ) {
-            $is_insert = true;
             $this->register_error($str);
 
             // If debug ALL queries
@@ -361,8 +326,9 @@ public function query(string $query, bool $use_prepare = false)
         }
 
         // Query was an insert, delete, update, replace
-        $is_insert = false;
+        $this->is_insert = false;
         if ( \preg_match("/^(insert|delete|update|replace)\s+/i", $query) ) {
+            $this->is_insert = true;
             $this->_affectedRows = \mysqli_affected_rows($this->dbh);
 
             // Take note of the insert_id
@@ -371,7 +337,7 @@ public function query(string $query, bool $use_prepare = false)
             }
 
             // Return number of rows affected
-            $return_val = $this->_affectedRows;
+            $this->return_val = $this->_affectedRows;
         } else {
             // Query was a select            
             if ( !\is_numeric($this->result) && !\is_bool($this->result)) {
@@ -397,17 +363,74 @@ public function query(string $query, bool $use_prepare = false)
                 $this->num_rows = $num_rows;
 
                 // Return number of rows selected
-                $return_val = $this->num_rows;
+                $this->return_val = $this->num_rows;
             }
         }
+    }
+
+    /**
+     * Perform mySQL query and try to determine result value
+     *
+     * @param string $query
+     * @param bool $use_prepare
+     * @return bool|mixed
+     */
+    public function query(string $query, bool $use_prepare = false)
+    {
+        $param = [];
+        if ($use_prepare)
+            $param = $this->prepareValues();
+        
+		// check for ezQuery placeholder tag and replace tags with proper prepare tag
+		$query = \str_replace(\_TAG, '?', $query);
+		
+        // Initialize return
+        $this->return_val = 0;
+
+        // Flush cached values..
+        $this->flush();
+
+        // For reg expressions
+        $query = \trim($query);
+
+        // Log how the function was called
+        $this->log_query("\$db->query(\"$query\")");
+
+        // Keep track of the last query for debug..
+        $this->last_query = $query;
+
+        // Count how many queries there have been
+        $this->num_queries++;
+
+        // Use core file cache function
+        if ( $cache = $this->get_cache($query) ) {
+            return $cache;
+        }
+
+        // If there is no existing database connection then try to connect
+        if ( ! isset($this->dbh) || ! $this->dbh ) {
+            $this->connect($this->database->getUser(), $this->database->getPassword(), $this->database->getHost());
+            $this->select($this->database->getName());
+        }
+
+        // Perform the query via std mysql_query function..
+		if (!empty($param) && \is_array($param) && ($this->isPrepareOn())) {
+            $this->shortcutUsed = true;
+            return $this->query_prepared($query, $param);
+        }
+        
+        $this->result = \mysqli_query($this->dbh, $query);
+
+        if ($this->processQueryResult($query) === false)
+            return false;
 
         // disk caching of queries
-        $this->store_cache($query, $is_insert);
+        $this->store_cache($query, $this->is_insert);
 
         // If debug ALL queries
         $this->trace || $this->debug_all ? $this->debug() : null ;
 
-        return $return_val;
+        return $this->return_val;
     } // query
 
     /**