bugfixed column inline collation and character set definitions

Author: yfix

src/PHPSQLParser/processors/ColumnDefinitionProcessor.php

@@ -219,7 +219,6 @@ public function process($tokens) {
                 continue 2;
 
             case 'ENUM':
-            case 'SET':
                 $currCategory = 'MULTIPLE_PARAM_PARENTHESIS';
                 $prevCategory = 'TEXT';
                 $expr[] = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim, 'sub_tree' => false);
@@ -240,41 +239,24 @@ public function process($tokens) {
                 continue 2;
 
             case 'CHARACTER':
-                if ($prevCategory === 'TEXT') {
-                    $parsed = array('expr_type' => ExpressionType::DATA_TYPE, 'base_expr' => $trim);
-                    $expr[] = array('expr_type' => ExpressionType::CHARSET, 'base_expr' => substr($base_expr, 0, -1),
-                                    'sub_tree' => $parsed);
-                    $base_expr = $token;
-                    $currCategory = 'CHARSET';
-                    continue 2;
-                }
-                // else ?
-                break;
+                $currCategory = 'CHARSET';
+                $options['sub_tree'][] = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim);
+                continue 2;
 
             case 'SET':
-            case 'CHARSET':
-                if ($currCategory === 'CHARSET') {
-                    // TODO: is it necessary to set special properties like the name or collation?
-                    $parsed = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim);
-                    $last = array_pop($expr);
-                    $last['sub_tree'][] = $parsed;
-                    $expr[] = $last;
-                    continue 2;
-                }
-                // else ?
-                break;
+				if ($currCategory == 'CHARSET') {
+    	            $options['sub_tree'][] = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim);
+				} else {
+	                $currCategory = 'MULTIPLE_PARAM_PARENTHESIS';
+    	            $prevCategory = 'TEXT';
+        	        $expr[] = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim, 'sub_tree' => false);
+				}
+                continue 2;
 
             case 'COLLATE':
-                if ($prevCategory === 'TEXT') {
-                    $parsed = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim);
-                    $expr[] = array('expr_type' => ExpressionType::COLLATE, 'base_expr' => substr($base_expr, 0, -1),
-                                    'sub_tree' => $parsed);
-                    $base_expr = $token;
-                    $currCategory = 'COLLATION';
-                    continue 2;
-                }
-                // else ?
-                break;
+                $currCategory = $upper;
+                $options['sub_tree'][] = array('expr_type' => ExpressionType::RESERVED, 'base_expr' => $trim);
+                continue 2;
 
             case 'NOT':
             case 'NULL':
@@ -364,25 +346,17 @@ public function process($tokens) {
 
                 case 'COLLATE':
                 // this is the collation name
-                    $parsed = array('expr_type' => ExpressionType::CONSTANT, 'base_expr' => $trim);
-                    $last = array_pop($expr);
-                    $last['sub_tree'][] = $parsed;
-                    $t = $base_expr;
-                    $base_expr = $last['base_expr'] . $base_expr;
-                    $last['base_expr'] = $t;
+                    $options['sub_tree'][] = array('expr_type' => ExpressionType::COLLATE, 'base_expr' => $trim);
+                    $options['collate'] = $trim;
                     $currCategory = $prevCategory;
                     break;
 
                 case 'CHARSET':
                 // this is the character set name
-                    $parsed = array('expr_type' => ExpressionType::CONSTANT, 'base_expr' => $trim);
-                    $last = array_pop($expr);
-                    $last['sub_tree'][] = $parsed;
-                    $t = $base_expr;
-                    $base_expr = $last['base_expr'] . $base_expr;
-                    $last['base_expr'] = $t;
+                    $options['sub_tree'][] = array('expr_type' => ExpressionType::CHARSET, 'base_expr' => $trim);
+                    $options['charset'] = $trim;
                     $currCategory = $prevCategory;
-                    break;
+                  break;
 
                 case 'SINGLE_PARAM_PARENTHESIS':
                     $parsed = $this->removeParenthesisFromStart($trim);