Merge remote-tracking branch 'upstream/master'

2023-03-04 19:17:16 +00:00 · 2014-05-30 15:19:22 +08:00
parent a9f290abf2 1c917c0fc4
commit 46589024f5
5 changed files with 90 additions and 2 deletions
@@ -1371,7 +1371,17 @@ public class SQLExprParser extends SQLParser {
                charType.setCollate(lexer.stringVal());
                lexer.nextToken();
            }
+        }else if(identifierEquals("COLLATE")){
+            lexer.nextToken();
+            
+            if (lexer.token() != Token.IDENTIFIER) {
+                throw new ParserException();
+            }
+            
+            charType.setCollate(lexer.stringVal());
+            lexer.nextToken();
        }
+        
        return charType;
    }