odps sql parser improved comment support

src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java

@@ -24,9 +24,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public abstract class SQLObjectImpl implements SQLObject {
 
-    private SQLObject           parent;
+    private SQLObject             parent;
 
-    private Map<String, Object> attributes;
+    protected Map<String, Object> attributes;
 
     public SQLObjectImpl(){
     }

src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java

@@ -16,6 +16,7 @@
 package com.alibaba.druid.sql.ast.statement;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 import com.alibaba.druid.sql.ast.SQLName;
@@ -119,4 +120,37 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
         }
         visitor.endVisit(this);
     }
+    
+    @SuppressWarnings("unchecked")
+    public void addBodyBeforeComment(List<String> comments) {
+        if (attributes == null) {
+            attributes = new HashMap<String, Object>(1);
+        }
+        
+        List<String> attrComments = (List<String>) attributes.get("format.body_before_comment");
+        if (attrComments == null) {
+            attributes.put("format.body_before_comment", comments);
+        } else {
+            attrComments.addAll(comments);
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    public List<String> getBodyBeforeCommentsDirect() {
+        if (attributes == null) {
+            return null;
+        }
+        
+        return (List<String>) attributes.get("format.body_before_comment");
+    }
+    
+    public boolean hasBodyBeforeComment() {
+        List<String> comments = getBodyBeforeCommentsDirect();
+        if (comments == null) {
+            return false;
+        }
+        
+        return !comments.isEmpty();
+    }
+    
 }

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java

@@ -22,7 +22,6 @@ import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.druid.sql.parser.CharTypes;
 import com.alibaba.druid.sql.parser.Keywords;
 import com.alibaba.druid.sql.parser.Lexer;
 import com.alibaba.druid.sql.parser.NotAllowCommentException;
@@ -512,9 +511,28 @@ public class MySqlLexer extends Lexer {
             return;
         }
     }
+    
+    private final static boolean[] identifierFlags = new boolean[256];
+    static {
+        for (char c = 0; c < identifierFlags.length; ++c) {
+            if (c >= 'A' && c <= 'Z') {
+                identifierFlags[c] = true;
+            } else if (c >= 'a' && c <= 'z') {
+                identifierFlags[c] = true;
+            } else if (c >= '0' && c <= '9') {
+                identifierFlags[c] = true;
+            }
+        }
+        // identifierFlags['`'] = true;
+        identifierFlags['_'] = true;
+        identifierFlags['-'] = true; // mysql
+    }
 
-    private boolean isIdentifierChar(char c) {
-        return c != '#' && CharTypes.isIdentifierChar(c);
+    public static boolean isIdentifierChar(char c) {
+        if (c <= identifierFlags.length) {
+            return identifierFlags[c];
+        }
+        return false;
     }
 
     public void scanNumber() {

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java

@@ -73,6 +73,10 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
         } else {
             accept(Token.LPAREN);
             
+            if (lexer.isKeepComments() && lexer.hasComment()) {
+                stmt.addBodyBeforeComment(lexer.readAndResetComments());
+            }
+            
             for (;;) {
                 if (lexer.token() != Token.IDENTIFIER) {
                     throw new ParserException("expect identifier");

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java

@@ -96,6 +96,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
         int size = x.getTableElementList().size();
         if (size > 0) {
             print0(" (");
+            
+            if (this.isPrettyFormat() && x.hasBodyBeforeComment()) {
+                print(' ');
+                printComment(x.getBodyBeforeCommentsDirect(), "");
+            }
+            
             incrementIndent();
             println();
             for (int i = 0; i < size; ++i) {