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

improved sql parameterized support.

Browse Source
This commit is contained in:
wenshao
2017-02-12 02:23:34 +08:00
parent 1f3c5467eb
commit 29b4b3ea29
5 changed files with 314 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java
+3
View File
@@ -47,6 +47,9 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable {
}
public void setExpr(SQLExpr expr) {
if (expr != null) {
expr.setParent(this);
}
this.expr = expr;
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+33 -9
View File
@@ -571,11 +571,34 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
}
}
if (isNumber) {
int start = quote ? 1 : 0;
String realName = name.substring(start, pos);
print0(realName);
incrementReplaceCunt();
return false;
boolean isAlias = false;
for (SQLObject parent = x.getParent();parent != null; parent = parent.getParent()) {
if (parent instanceof SQLSelectQueryBlock) {
SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom();
if (quote) {
String name2 = name.substring(1, name.length() - 1);
if (isTableSourceAlias(from, name, name2)) {
isAlias = true;
}
} else {
if (isTableSourceAlias(from, name)) {
isAlias = true;
}
}
break;
}
}
if (!isAlias) {
int start = quote ? 1 : 0;
String realName = name.substring(start, pos);
print0(realName);
incrementReplaceCunt();
return false;
} else {
print0(name);
return false;
}
}
}
@@ -866,7 +889,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
for (SQLObject parent = x.getParent();parent != null; parent = parent.getParent()) {
if (parent instanceof SQLSelectQueryBlock) {
SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom();
if (containsAlias(from, mapTableName, ownerName)) {
if (isTableSourceAlias(from, mapTableName, ownerName)) {
mapTableName = null;
}
break;
@@ -887,8 +910,9 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
return false;
}
protected boolean containsAlias(SQLTableSource from, String... tableNames) {
protected boolean isTableSourceAlias(SQLTableSource from, String... tableNames) {
String alias = from.getAlias();
if (alias != null) {
for (String tableName : tableNames) {
if (alias.equalsIgnoreCase(tableName)) {
@@ -907,8 +931,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
}
if (from instanceof SQLJoinTableSource) {
SQLJoinTableSource join = (SQLJoinTableSource) from;
return containsAlias(join.getLeft(), tableNames)
|| containsAlias(join.getRight(), tableNames);
return isTableSourceAlias(join.getLeft(), tableNames)
|| isTableSourceAlias(join.getRight(), tableNames);
}
return false;
}