Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed for sql parser

Browse Source
This commit is contained in:
wenshao
2013-04-22 17:13:14 +08:00
parent 68e7059b2c
commit 3ee310705f
3 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
+16
View File
@@ -163,6 +163,14 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
lexer.nextToken();
continue;
}
if (identifierEquals("COMMENT")) {
lexer.nextToken();
accept(Token.EQ);
stmt.getTableOptions().put("COMMENT", lexer.stringVal());
lexer.nextToken();
continue;
}
if (identifierEquals("PARTITION")) {
lexer.nextToken();
@@ -202,6 +210,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
}
stmt.getTableOptions().put("CHARACTER SET", lexer.stringVal());
lexer.nextToken();
continue;
} else if (identifierEquals("CHARSET")) {
lexer.nextToken();
if (lexer.token() == Token.EQ) {
@@ -209,6 +218,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
}
stmt.getTableOptions().put("CHARSET", lexer.stringVal());
lexer.nextToken();
continue;
}
}
@@ -266,6 +276,12 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
if (name != null) {
key.setName(name);
}
if (identifierEquals("USING")) {
lexer.nextToken();
key.setIndexType(lexer.stringVal());
lexer.nextToken();
}
return key;
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+21 -12
View File
@@ -431,10 +431,19 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(")");
for (Map.Entry<String, String> option : x.getTableOptions().entrySet()) {
String key = option.getKey();
print(" ");
print(option.getKey());
print(key);
print(" = ");
print(option.getValue());
if ("COMMENT".equals(key)) {
print('\'');
print(option.getValue());
print('\'');
} else {
print(option.getValue());
}
}
if (x.getQuery() != null) {
@@ -2595,7 +2604,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
public void endVisit(MySqlAlterTableChangeColumn x) {
}
@Override
public boolean visit(MySqlAlterTableModifyColumn x) {
print("MODIFY COLUMN ");
@@ -2612,7 +2621,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
return false;
}
@Override
public void endVisit(MySqlAlterTableModifyColumn x) {
@@ -2761,7 +2770,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public void endVisit(MySqlUnique x) {
}
@Override
@@ -2775,10 +2784,10 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print("FOREIGN KEY (");
printAndAccept(x.getReferencedColumns(), ", ");
print(")");
print(" REFERENCES ");
x.getReferencedTableName().accept(this);
print(" (");
printAndAccept(x.getReferencedColumns(), ", ");
print(")");
@@ -2787,7 +2796,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public void endVisit(MySqlForeignKey x) {
}
@Override
@@ -2798,9 +2807,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public void endVisit(MySqlAlterTableDiscardTablespace x) {
}
@Override
public boolean visit(MySqlAlterTableImportTablespace x) {
print("IMPORT TABLESPACE");
@@ -2809,9 +2818,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public void endVisit(MySqlAlterTableImportTablespace x) {
}
@Override
public boolean visit(SQLAssignItem x) {
x.getTarget().accept(this);