Merge pull request #39 from cfebs/fix-charset-collation

Fix field support for CHARACTER SET & COLLATE

Author: cfebs

src/Processor/CreateProcessor.php

@@ -277,8 +277,8 @@ private static function getIntegerDefinitionColumn(Query\MysqlColumnType $stmt)
      */
     private static function getTextDefinitionColumn(Query\MysqlColumnType $stmt)
     {
-        $collation = null;
-        $character_set = null;
+        $collation = $stmt->collation;
+        $character_set = $stmt->character_set;
 
         switch (strtoupper($stmt->type)) {
             case DataType::TEXT:

src/Schema/Column/CharacterColumn.php

@@ -69,9 +69,8 @@ public function getPhpCode() : string
 
         return '(new \\' . static::class . '('
             . $this->max_string_length
-            . ($this->character_set !== null && $this->collation !== null
-                ? ', \'' . $this->character_set . '\'' . ', \'' . $this->collation . '\''
-                : '')
+            . ($this->character_set !== null ? ', \'' . $this->character_set . '\'' : '')
+            . ($this->collation !== null ? ', \'' . $this->collation . '\'' : '')
             . '))'
             . $default
             . $this->getNullablePhp();

tests/CreateTableParseTest.php

@@ -1,32 +1,40 @@
 <?php
 namespace Vimeo\MysqlEngine\Tests;
 
-use Vimeo\MysqlEngine\Query\SelectQuery;
-use Vimeo\MysqlEngine\Query\Expression\ColumnExpression;
-use Vimeo\MysqlEngine\Query\Expression\CaseOperatorExpression;
-use Vimeo\MysqlEngine\Query\Expression\BinaryOperatorExpression;
+use Vimeo\MysqlEngine\Parser\CreateTableParser;
+use Vimeo\MysqlEngine\Processor\CreateProcessor;
+use Vimeo\MysqlEngine\Schema\TableDefinition;
 
 class CreateTableParseTest extends \PHPUnit\Framework\TestCase
 {
     public function testSimpleParse()
     {
         $query = file_get_contents(__DIR__ . '/fixtures/create_table.sql');
 
-        $create_queries = (new \Vimeo\MysqlEngine\Parser\CreateTableParser)->parse($query);
+        $create_queries = (new CreateTableParser)->parse($query);
 
-        $this->assertCount(5, $create_queries);
+        $this->assertNotEmpty($create_queries);
+
+        $table_defs = [];
 
         foreach ($create_queries as $create_query) {
-            $table = \Vimeo\MysqlEngine\Processor\CreateProcessor::makeTableDefinition(
+            $table = CreateProcessor::makeTableDefinition(
                 $create_query,
                 'foo'
             );
+            $table_defs[$table->name] = $table;
 
             $new_table_php_code = $table->getPhpCode();
 
             $new_table = eval('return ' . $new_table_php_code . ';');
 
-            $this->assertSame(\var_export($table, true), \var_export($new_table, true));
+            $this->assertSame(\var_export($table, true), \var_export($new_table, true),
+                "The table definition for {$table->name} did not match the generated php version.");
         }
+
+        // specific parsing checks
+        $this->assertInstanceOf(TableDefinition::class, $table_defs['tweets']);
+        $this->assertEquals('utf8mb4', $table_defs['tweets']->columns['text']->getCharacterSet());
+        $this->assertEquals('utf8mb4_unicode_ci', $table_defs['tweets']->columns['text']->getCollation());
     }
 }

tests/fixtures/create_table.sql

@@ -60,4 +60,11 @@ CREATE TABLE `orders`
 	`created_on`  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`id`)
-)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+
+CREATE TABLE `tweets` (
+	`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`text` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+	PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;