phpunit tests for secure PDO connection under mySqli, tests and fixes for create and drop table methods for all SQL drivers

TheTechsTech · TheTechsTech · commit e831a6a0d037 · 2019-03-12T22:10:11.000-04:00
diff --git a/lib/ez_sql_pdo.php b/lib/ez_sql_pdo.php
@@ -45,18 +45,19 @@ class ezSQL_pdo extends ezSQLcore
 
     private static $isSecure = false;
     private static $secure = null;
+    private $dbh;
 
     /**
      * Show errors
      * @var boolean Default is true
      */
     public $show_errors = true;
     
-	protected $preparedValues = array();
+    protected $preparedValues = array();
 
     /**
-     * Constructor - allow the user to perform a qucik connect at the same time
-     * as initialising the ezSQL_sqlite class
+     * Constructor - allow the user to perform a quick connect at the same time
+     * as initializing the ezSQL_sqlite class
      *
      * @param string $dsn The connection parameter string
      *                    Default is empty string
@@ -454,4 +455,12 @@ public function disconnect()
         }
      } // disconnect
 
+    /**
+     * Get connection handle
+     */
+    public function connection()
+    {
+        return $this->dbh;
+    }
+
 } // ezSQL_pdo
diff --git a/shared/ezFunctions.php b/shared/ezFunctions.php
@@ -95,7 +95,7 @@
 
         // String SQL data types
         const CHAR = 'CHAR';
-        const VARC = 'VARCHAR';
+        const VARS = 'VARCHAR';
         const VARCHAR = 'VARCHAR';
         const TEXT = 'TEXT';
         const TINY = 'TINYTEXT';
@@ -127,7 +127,6 @@
         const TINYINT = 'TINYINT';
         const SMALLINT = 'SMALLINT';
         const MEDIUMINT = 'MEDIUMINT';
-        const LARGE = 'BIGINT';
         const BIGINT = 'BIGINT';
         const DEC = 'DEC';
         const FIXED = 'FIXED';
@@ -138,9 +137,6 @@
         const BOOLEANS = 'BOOLEAN';
         const SMALLMONEY = 'SMALLMONEY';
         const MONEY = 'MONEY';
-        const SMALLSERIAL = 'SMALLSERIAL';
-        const SERIAL = 'SERIAL';
-        const BIGSERIAL = 'BIGSERIAL';
         
         // Date/Time SQL data types	
         const DATES = 'DATE';
@@ -167,12 +163,17 @@
         const INDEX = 'INDEX';
         const REFERENCES = 'REFERENCES';
 
-        const AUTO = 'AUTO_INCREMENT';
-        const IDENTITY = 'IDENTITY(1,1)';
+        const AUTO = '__autoNumbers__';
+        const AUTO_INCREMENT = 'AUTO_INCREMENT';
+        const AUTOINCREMENT = 'AUTOINCREMENT';
+        const IDENTITY = 'IDENTITY';
+        const SERIAL = 'SERIAL';
+        const SMALLSERIAL = 'SMALLSERIAL';
+        const BIGSERIAL = 'BIGSERIAL';
 
         const ADD = 'ADD';
         const DROP = 'DROP COLUMN';
-        const CHANGE = 'CHANGE';
+        const CHANGE = '__modifyColumn__';
 
         const _DS = \DIRECTORY_SEPARATOR;
 
diff --git a/shared/ezSchema.php b/shared/ezSchema.php
@@ -26,9 +26,9 @@ class ezSchema
 
     const NUMERICS = [
         'common' => ['NUMERIC', 'DECIMAL'],
-        'mysql' => ['DEC', 'FIXED', 'FLOAT', 'DOUBLE', 'DOUBLE PRECISION', 'REAL'],
-        'postgresql' => [],
+        'mysql' => ['IDENTITY','DEC', 'FIXED', 'FLOAT', 'DOUBLE', 'DOUBLE PRECISION', 'REAL'],
         'sqlserver' => ['DEC'],
+        'postgresql' => [],
         'sqlite3' => []
     ];
 
@@ -52,10 +52,17 @@ class ezSchema
 
     const OPTIONS  = ['CONSTRAINT', 'PRIMARY KEY', 'FOREIGN KEY', 'UNIQUE', 'INDEX', 'REFERENCES'];
     const CHANGES  = [
-        'mysql' => ['MODIFY'],
-        'postgresql' => ['ALTER COLUMN'],
-        'sqlserver' => ['ALTER COLUMN'],
-        'sqlite3' => []
+        'mysql' => 'MODIFY',
+        'postgresql' => 'ALTER COLUMN',
+        'sqlserver' => 'ALTER COLUMN',
+        'sqlite3' => ''
+     ];
+
+    const autoNUMBERS  = [
+        'mysql' => 'AUTO_INCREMENT',
+        'postgresql' => 'SERIAL',
+        'sqlserver' => 'IDENTITY(1,1)',
+        'sqlite3' => 'AUTOINCREMENT'
      ];
 
     private $arguments = null;
@@ -151,13 +158,14 @@ public static function vendor()
         elseif ($dbMssql === \getInstance() && !empty($dbMssql))
             $type = 'sqlserver';
         elseif ($dbPdo === \getInstance() && !empty($dbPdo)) {
-            if (strpos($dbPdo->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'mysql') !== false) 
+            $dbh = $dbPdo->connection();
+            if (strpos($dbh->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'mysql') !== false) 
                 $type = 'mysql';
-            elseif (strpos($dbPdo->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'pgsql') !== false) 
+            elseif (strpos($dbh->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'pgsql') !== false) 
                 $type = 'postgresql';
-            elseif (strpos($dbPdo->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'sqlite') !== false) 
+            elseif (strpos($dbh->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'sqlite') !== false) 
                 $type = 'sqlite3';
-            elseif (strpos($dbPdo->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'sqlsrv') !== false) 
+            elseif (strpos($dbh->getAttribute(\PDO::ATTR_CLIENT_VERSION), 'sqlsrv') !== false) 
                 $type = 'sqlserver';
         }
 
@@ -181,6 +189,7 @@ public static function column(string $column = null, string $type = null, ...$ar
         if (empty($column) || empty($type))
             return false;
 
+        $vendor = self::vendor();
         $columnData = '';
         if (($column == \CONSTRAINT) || ($column == \INDEX)) {
             if (empty($args[0]) || empty($args[1])) {
@@ -190,20 +199,25 @@ public static function column(string $column = null, string $type = null, ...$ar
             $keyType = ($column != \INDEX) ? \array_shift($args).' ' : ' ';
             $keys = $keyType.'('.\to_string($args).'), ';
             $columnData .= $column.' '.$type.' '.$keys;
-        } elseif (($column == \ADD) || ($column == \DROP)) {
+        } elseif (($column == \ADD) || ($column == \DROP) || ($column == \CHANGE)) {
             if ($column != \DROP) {
+                // check for modify placeholder and replace with vendors
+                $column = \str_replace(\CHANGE, self::CHANGES[$vendor], $column);
                 $column = $column.' '.$type;
                 $type2 = \array_shift($args);
                 $data = self::datatype($type2, ...$args);
-            } else
+            } elseif ($vendor != 'sqlite3')
                 $data = $type;
 
             if (!empty($data))
                 $columnData = $column.' '.$data.', ';
         } else {
             $data = self::datatype($type, ...$args);
-            if (!empty($data))
+            if (!empty($data)) {
+		        // check for sequence placeholder and replace with vendors
+		        $data = \str_replace(\AUTO, self::autoNUMBERS[$vendor], $data);
                 $columnData = $column.' '.$data.', ';
+            }
         }
 
         $schemaColumns = !empty($columnData) ? $columnData : null;
diff --git a/tests/mysqli/ezSQL_mysqliTest.php b/tests/mysqli/ezSQL_mysqliTest.php
@@ -288,9 +288,9 @@ public function testCreate()
         $this->object->select(self::TEST_DB_NAME);
              
         $this->assertEquals($this->object->create('new_create_test',
-            \column('id', INT0, 11, notNULL, AUTO),
-            \column('create_key', VARCHAR, 50),
-            \primary('id_pk', 'id')), 
+            column('id', INTR, 11, notNULL, AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
         0);
 
         $this->object->setPrepare(false);
diff --git a/tests/pdo/ezSQL_pdo_mysqlTest.php b/tests/pdo/ezSQL_pdo_mysqlTest.php
@@ -163,6 +163,64 @@ public function testMySQLQuery() {
 
         $this->assertEquals(0, $this->object->query('DROP TABLE unit_test'));
     } // testMySQLQuery
+
+    /**
+     * @covers ezSQL_pdo::securePDO
+     */
+    public function testSecurePDO()
+    {
+        securePDO('mysqli');
+        $this->assertTrue($this->object->connect('mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=' . self::TEST_DB_PORT, self::TEST_DB_USER, self::TEST_DB_PASSWORD));
+             
+        $this->assertEquals($this->object->drop('new_create_test2'), 0);
+        $this->assertEquals($this->object->create('new_create_test2',
+            column('id', INTR, 11, notNULL, AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
+        0);
+
+        $this->object->setPrepare(false);
+        $this->assertEquals($this->object->insert('new_create_test2',
+            ['create_key' => 'test 2']),
+        1);
+
+        $conn = $this->object->connection();
+        $res = $conn->query("SHOW STATUS LIKE 'Ssl_cipher';")->fetchAll();
+        $this->assertEquals('Ssl_cipher', $res[0]['Variable_name']);
+
+        $this->object->setPrepare();
+        $this->assertEquals($this->object->drop('new_create_test2'), 0);
+    }
+
+    /**
+     * @covers ezQuery::create
+     */
+    public function testCreate()
+    {
+        $this->assertTrue($this->object->connect('mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=' . self::TEST_DB_PORT, self::TEST_DB_USER, self::TEST_DB_PASSWORD));
+             
+        $this->assertEquals($this->object->create('new_create_test',
+            column('id', INTR, 11, notNULL, AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
+        0);
+
+        $this->object->setPrepare(false);
+        $this->assertEquals($this->object->insert('new_create_test',
+            ['create_key' => 'test 2']),
+        1);
+        $this->object->setPrepare();
+    }
+
+    /**
+     * @covers ezQuery::drop
+     */
+    public function testDrop()
+    {
+        $this->assertTrue($this->object->connect('mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=' . self::TEST_DB_PORT, self::TEST_DB_USER, self::TEST_DB_PASSWORD));
+             
+        $this->assertEquals($this->object->drop('new_create_test'), 0);
+    }
     
     /**
      * @covers ezSQLcore::insert
diff --git a/tests/postgresql/ezSQL_postgresqlTest.php b/tests/postgresql/ezSQL_postgresqlTest.php
@@ -181,7 +181,37 @@ public function testQuery() {
         
         $this->assertEquals(0, $this->object->query('DROP TABLE unit_test'));
     } // testQuery
-    
+
+     /**
+     * @covers ezQuery::create
+     */
+    public function testCreate()
+    {
+        $this->object->connect(self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME, self::TEST_DB_HOST, self::TEST_DB_PORT);
+             
+        $this->assertEquals($this->object->create('new_create_test',
+            column('id', AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
+        0);
+
+        $this->object->setPrepare(false);
+        $this->assertEquals($this->object->insert('new_create_test',
+            ['create_key' => 'test 2']),
+        1);
+        $this->object->setPrepare();
+    }
+
+    /**
+     * @covers ezQuery::drop
+     */
+    public function testDrop()
+    {
+        $this->object->connect(self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME, self::TEST_DB_HOST, self::TEST_DB_PORT);
+             
+        $this->assertEquals($this->object->drop('new_create_test'), 0);
+    }
+
     /**
      * @covers ezSQLcore::insert
      */
diff --git a/tests/sqlite/ezSQL_sqlite3Test.php b/tests/sqlite/ezSQL_sqlite3Test.php
@@ -126,6 +126,33 @@ public function testQuery()
         // Get rid of the table we created..
         $this->object->query("DROP TABLE test_table;");
     }   
+
+    /**
+     * @covers ezQuery::create
+     */
+    public function testCreate()
+    {
+        $this->assertEquals($this->object->create('new_create_test',
+            column('id', INTEGERS, notNULL, AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
+        0);
+
+        $this->object->setPrepare(false);
+        $this->assertEquals($this->object->insert('new_create_test',
+            ['create_key' => 'test 2']),
+        0);
+        $this->object->setPrepare();
+    }
+
+    /**
+     * @covers ezQuery::drop
+     */
+    public function testDrop()
+    {
+        $this->assertEquals($this->object->drop('new_create_test'), 0);
+    }
+
     /**
      * @covers ezQuery::insert
      */
@@ -150,8 +177,8 @@ public function testUpdate()
         $test_table['test_key'] = 'the key string';
         $where="test_key  =  test 1";
         $this->assertEquals(1, $this->object->update('test_table', $test_table, $where));
-        $this->assertEquals(1, $this->object->update('test_table', $test_table, eq('test_key','test 3', _AND),
-                                                                            eq('test_value','testing string 3')));
+        $this->assertEquals(1, $this->object->update(
+            'test_table', $test_table, eq('test_key','test 3', _AND), eq('test_value','testing string 3')));
         $where=eq('test_value','testing string 4');
         $this->assertEquals(0, $this->object->update('test_table', $test_table, $where));
         $this->assertEquals(1, $this->object->update('test_table', $test_table, "test_key  =  test 2"));
diff --git a/tests/sqlsrv/ezSQL_sqlsrvTest.php b/tests/sqlsrv/ezSQL_sqlsrvTest.php
@@ -166,7 +166,36 @@ public function testConvertMySqlTosqlsrv() {
         $result = $this->object->ConvertMySqlTosqlsrv("SELECT `test` FROM `unit_test`;");
         $this->assertEquals("SELECT test FROM unit_test;", $result);
     } // testConvertMySqlTosqlsrv
-    
+
+    /**
+     * @covers ezQuery::create
+     */
+    public function testCreate()
+    {
+        $this->object->quick_connect(self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME);
+             
+        $this->assertEquals($this->object->create('new_create_test',
+            column('id', AUTO),
+            column('create_key', VARCHAR, 50),
+            primary('id_pk', 'id')), 
+        0);
+
+        $this->object->setPrepare(false);
+        $this->assertEquals($this->object->insert('new_create_test',
+            ['create_key' => 'test 2']),
+        0);
+        $this->object->setPrepare();
+    }
+
+    /**
+     * @covers ezQuery::drop
+     */
+    public function testDrop()
+    {
+        $this->object->quick_connect(self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME);
+        $this->assertEquals($this->object->drop('new_create_test'), 0);
+    }
+
     /**
      * @covers ezSQLcore::insert
      */
