mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
improved sql parser. for issue #2080
This commit is contained in:
+22
-24
@@ -29,14 +29,7 @@ import com.alibaba.druid.sql.ast.SQLSubPartitionByHash;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
|
||||
import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCheck;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLSelect;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLTableConstraint;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
|
||||
import com.alibaba.druid.sql.ast.statement.*;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
|
||||
@@ -784,6 +777,8 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
|
||||
name = this.exprParser.name();
|
||||
}
|
||||
|
||||
SQLTableConstraint constraint = null;
|
||||
|
||||
if (lexer.token() == (Token.KEY)) {
|
||||
lexer.nextToken();
|
||||
|
||||
@@ -840,41 +835,44 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
|
||||
lexer.nextToken();
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.PRIMARY) {
|
||||
constraint = key;
|
||||
} else if (lexer.token() == Token.PRIMARY) {
|
||||
MySqlPrimaryKey pk = this.getExprParser().parsePrimaryKey();
|
||||
if (name != null) {
|
||||
pk.setName(name);
|
||||
}
|
||||
pk.setHasConstaint(hasConstaint);
|
||||
return pk;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.UNIQUE) {
|
||||
constraint = pk;
|
||||
} else if (lexer.token() == Token.UNIQUE) {
|
||||
MySqlUnique uk = this.getExprParser().parseUnique();
|
||||
if (name != null) {
|
||||
uk.setName(name);
|
||||
}
|
||||
uk.setHasConstaint(hasConstaint);
|
||||
return uk;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.FOREIGN) {
|
||||
constraint = uk;
|
||||
} else if (lexer.token() == Token.FOREIGN) {
|
||||
MysqlForeignKey fk = this.getExprParser().parseForeignKey();
|
||||
fk.setName(name);
|
||||
fk.setHasConstraint(hasConstaint);
|
||||
return fk;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.CHECK) {
|
||||
constraint = fk;
|
||||
} else if (lexer.token() == Token.CHECK) {
|
||||
lexer.nextToken();
|
||||
SQLCheck check = new SQLCheck();
|
||||
check.setName(name);
|
||||
SQLExpr expr = this.exprParser.expr();
|
||||
check.setExpr(expr);
|
||||
return check;
|
||||
constraint = check;
|
||||
}
|
||||
|
||||
if (constraint != null) {
|
||||
if (lexer.token() == Token.COMMENT) {
|
||||
lexer.nextToken();
|
||||
SQLExpr comment = this.exprParser.primary();
|
||||
constraint.setComment(comment);
|
||||
}
|
||||
|
||||
return constraint;
|
||||
}
|
||||
|
||||
throw new ParserException("TODO. " + lexer.info());
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package com.alibaba.druid.sql.dialect.mysql.parser;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
import com.alibaba.druid.sql.ast.*;
|
||||
import com.alibaba.druid.sql.ast.SQLParameter.ParameterType;
|
||||
import com.alibaba.druid.sql.ast.expr.*;
|
||||
@@ -36,6 +37,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlSelectIntoStatement;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.statement.*;
|
||||
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLockTableStatement.LockType;
|
||||
import com.alibaba.druid.sql.parser.*;
|
||||
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
|
||||
import com.alibaba.druid.util.FnvHash;
|
||||
import com.alibaba.druid.util.JdbcConstants;
|
||||
|
||||
@@ -2385,12 +2387,14 @@ public class MySqlStatementParser extends SQLStatementParser {
|
||||
int pos = lexer.pos();
|
||||
if (cachedColumns != null
|
||||
&& lexer.text.startsWith(cachedColumns.columnsString, pos)) {
|
||||
List<SQLExpr> columns = stmt.getColumns();
|
||||
List<SQLExpr> cachedColumns2 = cachedColumns.columns;
|
||||
for (int i = 0, size = cachedColumns2.size(); i < size; i++) {
|
||||
columns.add(cachedColumns2.get(i).clone());
|
||||
if (!lexer.isEnabled(SQLParserFeature.OptimizedForParameterized)) {
|
||||
List<SQLExpr> columns = stmt.getColumns();
|
||||
List<SQLExpr> cachedColumns2 = cachedColumns.columns;
|
||||
for (int i = 0, size = cachedColumns2.size(); i < size; i++) {
|
||||
columns.add(cachedColumns2.get(i).clone());
|
||||
}
|
||||
}
|
||||
stmt.setColumnsString(cachedColumns.columnsString);
|
||||
stmt.setColumnsString(cachedColumns.columnsFormattedString);
|
||||
int p2 = pos + cachedColumns.columnsString.length();
|
||||
lexer.reset(p2);
|
||||
lexer.nextToken();
|
||||
@@ -2449,8 +2453,14 @@ public class MySqlStatementParser extends SQLStatementParser {
|
||||
clonedColumns.add(columns.get(i).clone());
|
||||
}
|
||||
|
||||
insertColumnsCache.put(tableName.hashCode64(), columnsString, clonedColumns);
|
||||
stmt.setColumnsString(columnsString);
|
||||
StringBuilder buf = new StringBuilder();
|
||||
SQLASTOutputVisitor outputVisitor = SQLUtils.createOutputVisitor(buf, dbType);
|
||||
outputVisitor.printInsertColumns(columns);
|
||||
|
||||
String formattedColumnsString = buf.toString();
|
||||
|
||||
insertColumnsCache.put(tableName.hashCode64(), columnsString, formattedColumnsString, clonedColumns);
|
||||
stmt.setColumnsString(formattedColumnsString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -859,27 +859,32 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
|
||||
tableSource.accept(this);
|
||||
}
|
||||
|
||||
List<SQLExpr> columns = x.getColumns();
|
||||
if (columns.size() > 0) {
|
||||
this.indentCount++;
|
||||
print0(" (");
|
||||
for (int i = 0, size = columns.size(); i < size; ++i) {
|
||||
if (i != 0) {
|
||||
if (i % 5 == 0) {
|
||||
println();
|
||||
String columnsString = x.getColumnsString();
|
||||
if (columnsString != null) {
|
||||
print0(columnsString);
|
||||
} else {
|
||||
List<SQLExpr> columns = x.getColumns();
|
||||
if (columns.size() > 0) {
|
||||
this.indentCount++;
|
||||
print0(" (");
|
||||
for (int i = 0, size = columns.size(); i < size; ++i) {
|
||||
if (i != 0) {
|
||||
if (i % 5 == 0) {
|
||||
println();
|
||||
}
|
||||
print0(", ");
|
||||
}
|
||||
print0(", ");
|
||||
}
|
||||
|
||||
SQLExpr column = columns.get(i);
|
||||
if (column instanceof SQLIdentifierExpr) {
|
||||
print0(((SQLIdentifierExpr) column).getName());
|
||||
} else {
|
||||
printExpr(column);
|
||||
SQLExpr column = columns.get(i);
|
||||
if (column instanceof SQLIdentifierExpr) {
|
||||
print0(((SQLIdentifierExpr) column).getName());
|
||||
} else {
|
||||
printExpr(column);
|
||||
}
|
||||
}
|
||||
print(')');
|
||||
this.indentCount--;
|
||||
}
|
||||
print(')');
|
||||
this.indentCount--;
|
||||
}
|
||||
|
||||
List<SQLInsertStatement.ValuesClause> valuesList = x.getValuesList();
|
||||
@@ -2682,6 +2687,12 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
|
||||
printAndAccept(x.getColumns(), ", ");
|
||||
print(')');
|
||||
|
||||
SQLExpr comment = x.getComment();
|
||||
if (comment != null) {
|
||||
print0(" COMMENT ");
|
||||
comment.accept(this);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -4025,4 +4036,40 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
|
||||
x.accept(this);
|
||||
}
|
||||
}
|
||||
|
||||
public void printInsertColumns(List<SQLExpr> columns) {
|
||||
final int size = columns.size();
|
||||
if (size > 0) {
|
||||
if (size > 5) {
|
||||
this.indentCount++;
|
||||
print(' ');
|
||||
}
|
||||
print('(');
|
||||
for (int i = 0; i < size; ++i) {
|
||||
if (i != 0) {
|
||||
if (i % 5 == 0) {
|
||||
println();
|
||||
}
|
||||
print0(", ");
|
||||
}
|
||||
|
||||
SQLExpr column = columns.get(i);
|
||||
if (column instanceof SQLIdentifierExpr) {
|
||||
visit((SQLIdentifierExpr) column);
|
||||
} else {
|
||||
printExpr(column);
|
||||
}
|
||||
|
||||
String dataType = (String) column.getAttribute("dataType");
|
||||
if (dataType != null) {
|
||||
print(' ');
|
||||
print(dataType);
|
||||
}
|
||||
}
|
||||
print(')');
|
||||
if (size > 5) {
|
||||
this.indentCount--;
|
||||
}
|
||||
}
|
||||
}
|
||||
} //
|
||||
|
||||
Reference in New Issue
Block a user