bug fix, add/update preset table functions, finish removing global functions where table name passed in

Author: TheTechsTech

README.md

@@ -29,8 +29,9 @@ Mainly by:
     - Renamed `select` of `ez_mysqli` to `dbSelect`.
     - Renamed class method and behavior of `selecting` to `select`.
     - `selecting`, and new `inserting` methods, can be called without table name, only the other necessary parameters:
-        - The Table *name* with *prefix*, can be preset/stored with methods `tableSetup(name, prefix), or setTable(name), setPrefix(append)`, if called without presetting, `false` is returned.
-        - This **feature** will be added to **all** database access methods, each method name will have an `ing` ending added.
+        - The table *name* with *prefix*, can be preset/stored with methods `tableSetup(name, prefix), or setTable(name), setPrefix(append)`, if called without presetting, `false` is returned.
+        - This **feature** will be added to **all** database *CRUD* access methods , each method name will have an `ing` ending added.
+    - Removed global functions where `table` name passed in, use functions using preset table names ending with `ing`.
 
 [__version 4__](https://github.com/ezSQL/ezsql/tree/v4) has many modern programming practices in which will break users of version 3.
 

lib/ezFunctions.php

@@ -595,7 +595,7 @@ function inserting(array $keyValue)
     /**
      * Preforms a `update` method call on a already preset `table name`, and optional `prefix`
      *
-     * This function **expects** either `tableSetup(name, prefix)`, `setTable(name)`, or `setPrefix(append)`
+     * This function **expects** either `table_setup(name, prefix)`, `set_table(name)`, or `set_prefix(append)`
      * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
      *
      * Does an `update` query with an array, by conditional operator array
@@ -632,7 +632,7 @@ function updating(array $keyValue, ...$whereConditions)
     /**
      * Preforms a `create` method call on a already preset `table name`, and optional `prefix`
      *
-     * This function **expects** either `tableSetup(name, prefix)`, `setTable(name)`, or `setPrefix(append)`
+     * This function **expects** either `table_setup(name, prefix)`, `set_table(name)`, or `set_prefix(append)`
      * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
      *
      * Creates an database table with columns, by either:
@@ -664,7 +664,7 @@ function creating(...$schemas)
     /**
      * Preforms a `delete` method call on a already preset `table name`, and optional `prefix`
      *
-     * This function **expects** either `tableSetup(name, prefix)`, `setTable(name)`, or `setPrefix(append)`
+     * This function **expects** either `table_setup(name, prefix)`, `set_table(name)`, or `set_prefix(append)`
      * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
      *
      * Does an `delete` query with an array
@@ -698,6 +698,42 @@ function deleting(...$whereConditions)
             : false;
     }
 
+    /**
+     * Preforms a `replace` method call on a already preset `table name`, and optional `prefix`
+     *
+     * This function **expects** either `table_setup(name, prefix)`, `set_table(name)`, or `set_prefix(append)`
+     * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
+     *
+     * Does an `replace` query with an array
+     * @param array $keyValue - table fields, assoc array with key = value (doesn't need escaping)
+     * @return mixed bool/id of replaced record, or false for error
+     */
+    function replacing(array $keyValue)
+    {
+        $ezQuery = getInstance();
+        return ($ezQuery instanceof DatabaseInterface)
+            ? $ezQuery->replacing($keyValue)
+            : false;
+    }
+
+    /**
+     * Preforms a `drop` method call on a already preset `table name`, and optional `prefix`
+     *
+     * This function **expects** either `table_setup(name, prefix)`, `set_table(name)`, or `set_prefix(append)`
+     * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
+     *
+     * Does an `drop` table query if table exists.
+     *
+     * @return bool|int
+     */
+    function dropping()
+    {
+        $ezQuery = getInstance();
+        return ($ezQuery instanceof DatabaseInterface)
+            ? $ezQuery->dropping()
+            : false;
+    }
+
     /**
      * Set table `name` and `prefix` for global usage on calls to database
      * **method/function** *names* ending with `ing`.
@@ -744,7 +780,7 @@ function set_prefix(string $append = '')
     }
 
     /**
-     * Does an select into statement by calling selecting method
+     * Does an `select into` statement by calling `select` method
      * @param $newTable, - new database table to be created
      * @param $fromColumns - the columns from old database table
      * @param $oldTable - old database table
@@ -1081,7 +1117,7 @@ function fullJoin(
     }
 
     /**
-     * Returns an `UNION` SELECT SQL string, given the
+     * Returns an `UNION` SELECT `SQL` string, given the
      *   - table, column fields, conditions or conditional array.
      *
      * In the following format:
@@ -1112,7 +1148,7 @@ function union($table = '', $columnFields = '*', ...$conditions)
     }
 
     /**
-     * Returns an `UNION ALL` SELECT SQL string, given the
+     * Returns an `UNION ALL` SELECT `SQL` string, given the
      *   - table, column fields, conditions or conditional array.
      *
      * In the following format:
@@ -1174,20 +1210,6 @@ function limit($numberOf, $offset = null)
             : false;
     }
 
-    /**
-     * Does an `replace` query with an array
-     * @param $table, - database table to access
-     * @param $keyValue - table fields, assoc array with key = value (doesn't need escaping)
-     * @return mixed bool/id of replaced record, or false for error
-     */
-    function replace($table = '', $keyValue = null)
-    {
-        $ezQuery = getInstance();
-        return ($ezQuery instanceof DatabaseInterface)
-            ? $ezQuery->replace($table, $keyValue)
-            : false;
-    }
-
     function ezFunctions()
     {
         return true;

lib/ezQuery.php

@@ -987,12 +987,6 @@ public function alter(string $table = null, ...$schemas)
         return false;
     }
 
-    /**
-     * Does an `drop` table query if table exists.
-     * @param $table - database table to erase
-     *
-     * @return bool
-     */
     public function drop(string $table = null)
     {
         if (empty($table))
@@ -1039,6 +1033,12 @@ public function creating(...$schemas)
         return ($table === false) ? false : $this->create($table, ...$schemas);
     }
 
+    public function dropping()
+    {
+        $table = $this->table_prefix();
+        return ($table === false) ? false : $this->drop($table);
+    }
+
     /**
      * Check and return the stored **global** database `table` preset with any `prefix`.
      *

lib/ezQueryInterface.php

@@ -610,6 +610,18 @@ public function deleting(...$whereConditions);
      */
     public function replace(string $table = null, $keyValue);
 
+    /**
+     * Preforms a `replace` method call on a already preset `table name`, and optional `prefix`
+     *
+     * This method **expects** either `tableSetup(name, prefix)`, `setTable(name)`, or `setPrefix(append)`
+     * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
+     *
+     * Does an `replace` query with an array
+     * @param array $keyValue - table fields, assoc array with key = value (doesn't need escaping)
+     * @return mixed bool/id of replaced record, or false for error
+     */
+    function replacing(array $keyValue);
+
     /**
      * Does an `insert` query with an array
      * @param $table, - database table to access
@@ -700,4 +712,24 @@ public function create(string $table = null, ...$schemas);
      * @return mixed results of query() call
      */
     public function creating(...$schemas);
+
+    /**
+     * Does an `drop` table query if table exists.
+     * @param string $table - database table to erase
+     *
+     * @return bool|int
+     */
+    public function drop(string $table = null);
+
+    /**
+     * Preforms a `drop` method call on a already preset `table name`, and optional `prefix`
+     *
+     * This method **expects** either `tableSetup(name, prefix)`, `setTable(name)`, or `setPrefix(append)`
+     * to have been called **before usage**, otherwise will return `false`, if no `table name` previous stored.
+     *
+     * Does an `drop` table query if table exists.
+     *
+     * @return bool|int
+     */
+    public function dropping();
 }

tests/ezFunctionsTest.php

@@ -41,7 +41,8 @@
     updating,
     creating,
     deleting,
-    replace,
+    dropping,
+    replacing,
     selecting,
     inserting,
     table_setup,
@@ -263,6 +264,16 @@ public function testSelecting()
         $this->assertFalse(selecting());
     }
 
+    public function testReplacing()
+    {
+        $this->assertFalse(replacing(['data' => 'data2']));
+    }
+
+    public function testDropping()
+    {
+        $this->assertFalse(dropping());
+    }
+
     public function testSet_Table()
     {
         $this->assertFalse(set_table());
@@ -272,9 +283,4 @@ public function testSet_Prefix()
     {
         $this->assertFalse(set_prefix());
     }
-
-    public function testReplace()
-    {
-        $this->assertFalse(replace('field', ['data' => 'data2']));
-    }
 }

tests/mysqli/mysqliTest.php

@@ -268,6 +268,7 @@ public function testReplace()
 
     public function testCreatingReplacing()
     {
+        $this->object->quick_connect();
         $this->object->prepareOff();
         $this->assertFalse($this->object->replacing([]));
         $this->assertFalse($this->object->creating([]));
@@ -276,12 +277,14 @@ public function testCreatingReplacing()
         $this->assertEquals(
             0,
             $this->object->creating(
-                column('id', INTR, 11, PRIMARY),
+                column('id', INTR, 11, AUTO, PRIMARY),
                 column('test_key', VARCHAR, 50)
             )
         );
 
-        inserting(array('id' => 3, 'test_key' => 'test 3'));
+        inserting(array('test_key' => 'test 1'));
+        inserting(array('test_key' => 'test 2'));
+        inserting(array('test_key' => 'test 3'));
         $this->assertEquals(3, $this->object->replacing(array('id' => 3, 'test_key' => 'test 4')));
     }