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
2017-01-17 00:14:23 +08:00
parent e6341c4a89
commit c75a3b52e0
10 changed files with 525 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java
+2 -2
View File
@@ -209,7 +209,7 @@ public class ParameterizedOutputVisitorUtils {
// ID = ? OR ID = ? => ID = ?
if (x.getOperator() == SQLBinaryOperator.BooleanOr) {
if ((left instanceof SQLBinaryOpExpr) && (right instanceof SQLBinaryOpExpr)) {
if ((x.getLeft() instanceof SQLBinaryOpExpr) && (x.getRight() instanceof SQLBinaryOpExpr)) {
SQLBinaryOpExpr leftBinary = (SQLBinaryOpExpr) x.getLeft();
SQLBinaryOpExpr rightBinary = (SQLBinaryOpExpr) x.getRight();
@@ -220,7 +220,7 @@ public class ParameterizedOutputVisitorUtils {
if (isLiteralExpr(leftBinary.getLeft()) //
&& leftBinary.getOperator() == SQLBinaryOperator.BooleanOr) {
if (mergeEqual(leftBinary.getRight(), right)) {
if (mergeEqual(leftBinary.getRight(), x.getRight())) {
v.incrementReplaceCunt();
return leftBinary;
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+44 -2
View File
@@ -846,7 +846,26 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
public boolean visit(SQLPropertyExpr x) {
SQLExpr owner = x.getOwner();
owner.accept(this);
String mapTableName = null;
if (owner instanceof SQLIdentifierExpr) {
String ownerName = ((SQLIdentifierExpr) owner).getName();
if (tableMapping != null) {
mapTableName = tableMapping.get(ownerName);
if (mapTableName == null
&& ownerName.length() > 2
&& ownerName.charAt(0) == '`'
&& ownerName.charAt(ownerName.length() - 1) == '`') {
mapTableName = tableMapping.get(ownerName.substring(1, ownerName.length() - 1));
}
}
}
if (mapTableName != null) {
print0(mapTableName);
} else {
owner.accept(this);
}
print('.');
String name = x.getName();
@@ -1096,7 +1115,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
protected void addTable(String table) {
if (tables == null) {
tables = new HashSet<String>();
tables = new LinkedHashSet<String>();
}
this.tables.add(table);
}
@@ -1110,6 +1129,29 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
String tableName = expr.toString();
String destTableName = tableMapping.get(tableName);
if (destTableName == null) {
if (expr instanceof SQLPropertyExpr) {
SQLPropertyExpr propertyExpr = (SQLPropertyExpr) expr;
String propName = propertyExpr.getName();
destTableName = tableMapping.get(propName);
if (destTableName == null
&& propName.length() > 2 && propName.charAt(0) == '`' && propName.charAt(propName.length() - 1) == '`') {
destTableName = tableMapping.get(propName.substring(1, propName.length() - 1));
}
if (destTableName != null) {
propertyExpr.getOwner().accept(this);
print('.');
print(destTableName);
return;
}
} else if (expr instanceof SQLIdentifierExpr) {
boolean quote = tableName.length() > 2 && tableName.charAt(0) == '`' && tableName.charAt(tableName.length() - 1) == '`';
if (quote) {
destTableName = tableMapping.get(tableName.substring(1, tableName.length() - 1));
}
}
}
if (destTableName != null) {
tableName = destTableName;
print0(tableName);
src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
protected final Map<String, SQLObject> variants = new LinkedHashMap<String, SQLObject>();
protected Map<String, String> aliasMap = new HashMap<String, String>();
protected Map<String, String> aliasMap = new LinkedHashMap<String, String>();
protected String currentTable;