Updated to 1.1.6 version

Author: josantonius

src/Database/Database.php

@@ -96,6 +96,7 @@ class Database {
         'data'       => null, // array  → columns and values
         'table'      => null, // string → database table name
         'order'      => null, // mixed  → order clause
+        'charset'    => null, // string → database charset
         'limit'      => null, // int    → limit clause
         'where'      => null, // mixed  → where clause
         'engine'     => null, // string → database engine

src/Database/Provider/PDOprovider/PDOprovider.php

@@ -181,7 +181,7 @@ public function create($table, $data, $foreing, $reference, $on, $actions, $engi
         $index      = '';
         $references = '';
 
-        if (!is_null($foreing, $reference, $on) && count($foreing) === count($on) && count($reference) === count($foreing)) {
+        if (!is_null($foreing) && !is_null($reference) && !is_null($on) && count($foreing) === count($on) && count($reference) === count($foreing)) {
 
             $count = count($foreing);
 
@@ -206,7 +206,7 @@ public function create($table, $data, $foreing, $reference, $on, $actions, $engi
 
         $engine = (!is_null($engine)) ? ' ENGINE=' . $engine : '';
 
-        $charset = (!is_null($engine)) ? ' CHARSET=' . $charset : '';
+        $charset = (!is_null($charset)) ? ' CHARSET=' . $charset : '';
 
         $query = $query . $index . $references;
 

tests/Database/Test/DatabaseConnectionTest.php

@@ -212,5 +212,4 @@ public function testExceptionAccessDeniedForUserName() {
             array('charset' => 'utf8')
         );
     }
-
 }

tests/Database/Test/DatabaseCreateTest.php

@@ -22,7 +22,7 @@ final class DatabaseCreateTest extends TestCase {
      *
      * @since 1.1.6
      *
-     * @return void
+     * @return object → database connection
      */
     public function testGetConnection() {
 
@@ -58,4 +58,144 @@ public function testCreateTableQuery($db) {
         $this->assertTrue($result);
     }
 
+    /**
+     * [QUERY] [CREATE TABLE] [EXCEPTION] [SINTAX ERROR]
+     *
+     * @since 1.1.6
+     *
+     * @depends testGetConnection
+     *
+     * @expectedException Josantonius\Database\Exception\DBException
+     *
+     * @expectedExceptionMessage Syntax error or access violation
+     *
+     * @return void
+     */
+    public function testCreateTableQueryError($db) {
+
+        $result = $db->query(
+
+            'CREATE TABLE IF NOT EXISTS test (
+
+                id       INT(6)      UNSIGNED AUTO_INCREMENT PRIMARY KEY, 
+                name     VARCHAR(30) NOT NULL,
+                email    VARCHAR(50),
+                reg_date TIMESTAMP
+            '
+        );
+    }
+
+    /**
+     * [METHOD] [CREATE TABLE] [RETURN TRUE]
+     *
+     * @since 1.1.6
+     *
+     * @depends testGetConnection
+     *
+     * @return void
+     */
+    public function testCreateTableMethod($db) {
+
+        $params = [
+
+            'id'       => 'INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY', 
+            'name'     => 'VARCHAR(30) NOT NULL',
+            'email'    => 'VARCHAR(50)',
+            'reg_date' => 'TIMESTAMP'
+        ];
+
+        $this->assertTrue($db->create($params)->table('test')->execute());
+    }
+
+    /**
+     * [METHOD] [CREATE TABLE] [EXCEPTION] [SINTAX ERROR]
+     *
+     * @since 1.1.6
+     *
+     * @depends testGetConnection
+     *
+     * @expectedException Josantonius\Database\Exception\DBException
+     *
+     * @expectedExceptionMessage Syntax error or access violation
+     *
+     * @return void
+     */
+    public function testCreateTableMethodError($db) {
+
+        $params = [
+
+            'id'       => 'INT(6 UNSIGNED AUTO_INCREMENT PRIMARY KEY', 
+            'name'     => 'VARCHAR(30) NOT NULL',
+            'email'    => 'VARCHAR(50)',
+            'reg_date' => 'TIMESTAMP'
+        ];
+
+        $db->create($params)->table('test')->execute();
+    }
+
+    /**
+     * [METHOD] [CREATE TABLE] [RETURN TRUE]
+     *
+     * @since 1.1.6
+     *
+     * @depends testGetConnection
+     *
+     * @return void
+     */
+    public function testCreateTableMethod2($db) {
+
+        $params = [
+
+            'id'       => 'INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY', 
+            'name'     => 'VARCHAR(30) NOT NULL',
+            'email'    => 'VARCHAR(50)',
+            'reg_date' => 'TIMESTAMP'
+        ];
+
+        $query = $db->create($params)
+                    ->table('test_2')
+                    ->foreing('id')
+                    ->reference('id')
+                    ->on('test')
+                    ->actions('ON DELETE CASCADE ON UPDATE CASCADE')
+                    ->engine('innodb')
+                    ->charset('utf8');
+
+        $this->assertTrue($query->execute());
+    }
+
+    /**
+     * [METHOD] [CREATE TABLE] [EXCEPTION] [SINTAX ERROR]
+     *
+     * @since 1.1.6
+     *
+     * @depends testGetConnection
+     *
+     * @expectedException Josantonius\Database\Exception\DBException
+     *
+     * @expectedExceptionMessage Syntax error or access violation
+     *
+     * @return void
+     */
+    public function testCreateTableMethod2Error($db) {
+
+        $params = [
+
+            'id'       => 'INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY', 
+            'name'     => 'VARCHAR(30) NOT NULL',
+            'email'    => 'VARCHAR(50)',
+            'reg_date' => 'TIMESTAMP'
+        ];
+
+        $query = $db->create($params)
+                    ->table('test_2')
+                    ->foreing('id')
+                    ->reference('id')
+                    ->on('test')
+                    ->actions('ONDELETE CASCADE ON UPDATE CASCADE')
+                    ->engine('innodb')
+                    ->charset('utf8');
+
+        $query->execute();
+    }
 }