ColumnDefinition: fixed order of CHARACTER SET & COLLATE for MySQL

Author: janpecha

src/Statements/ColumnDefinition.php

@@ -3,6 +3,7 @@
 	namespace CzProject\SqlGenerator\Statements;
 
 	use CzProject\SqlGenerator\DuplicateException;
+	use CzProject\SqlGenerator\Drivers;
 	use CzProject\SqlGenerator\Helpers;
 	use CzProject\SqlGenerator\IDriver;
 	use CzProject\SqlGenerator\IStatement;
@@ -109,14 +110,27 @@ public function toSql(IDriver $driver)
 				$output .= '(' . implode(', ', $parameters) . ')';
 			}
 
-			foreach ($this->options as $option => $value) {
-				$output .= ' ' . $option;
+			$options = $this->options;
+			$specialOptions = array();
 
-				if ($value !== NULL) {
-					$output .= ' ' . $value;
+			if ($driver instanceof Drivers\MysqlDriver) {
+				$specialOptions = array(
+					'CHARACTER SET',
+					'COLLATE',
+				);
+			}
+
+			foreach ($specialOptions as $option) {
+				if (isset($options[$option])) {
+					$output .= ' ' . self::formatOption($option, $options[$option]);
+					unset($options[$option]);
 				}
 			}
 
+			foreach ($options as $option => $value) {
+				$output .= ' ' . self::formatOption($option, $value);
+			}
+
 			$output .= ' ' . ($this->nullable ? 'NULL' : 'NOT NULL');
 
 			if (isset($this->defaultValue)) {
@@ -133,4 +147,15 @@ public function toSql(IDriver $driver)
 
 			return $output;
 		}
+
+
+		/**
+		 * @param  string
+		 * @param  string|NULL
+		 * @return string
+		 */
+		private static function formatOption($name, $value)
+		{
+			return $name . ($value !== NULL ? (' ' . $value) : '');
+		}
 	}

tests/SqlGenerator/ColumnDefinition.mysql.phpt

@@ -0,0 +1,20 @@
+<?php
+
+use CzProject\SqlGenerator\Drivers;
+use CzProject\SqlGenerator\Statements\ColumnDefinition;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../libs/DummyDriver.php';
+
+
+test(function () {
+
+	$column = new ColumnDefinition('name', 'VARCHAR', array(100), array(
+		'OPTION' => 'option_value',
+		'COLLATE' => 'latin2_general_ci',
+		'CHARACTER SET' => 'latin2',
+	));
+	Assert::same('`name` VARCHAR(100) CHARACTER SET latin2 COLLATE latin2_general_ci OPTION option_value NOT NULL', $column->toSql(new Drivers\MysqlDriver));
+
+});