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 parsre parameterized.

Browse Source
This commit is contained in:
wenshao
2017-06-25 18:38:12 +08:00
parent 5a913ded09
commit 4decf975c6
11 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/SQLUtils.java
+1 -1
View File
@@ -268,7 +268,7 @@ public class SQLUtils {
StringBuilder out = new StringBuilder();
SQLASTOutputVisitor visitor = createFormatOutputVisitor(out, statementList, dbType);
if (parameters != null) {
visitor.setParameters(parameters);
visitor.setInputParameters(parameters);
}
if (option == null) {
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+1 -2
View File
@@ -669,10 +669,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
public boolean visit(SQLVariantRefExpr x) {
{
int parametersSize = this.getParametersSize();
int index = x.getIndex();
if (index >= 0 && index < parametersSize) {
if (inputParameters != null && index < inputParameters.size()) {
return super.visit(x);
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+17 -15
View File
@@ -53,6 +53,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
protected boolean groupItemSingleLine = false;
protected List<Object> parameters;
protected List<Object> inputParameters;
protected Set<String> tables;
protected boolean exportTables = false;
@@ -86,14 +87,6 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
this.parameterized = parameterized;
}
public int getParametersSize() {
if (parameters == null) {
return 0;
}
return this.parameters.size();
}
public int getReplaceCount() {
return this.replaceCount;
}
@@ -133,8 +126,17 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
return this.tables;
}
@Deprecated
public void setParameters(List<Object> parameters) {
this.parameters = parameters;
if (parameters != null && parameters.size() > 0) {
this.inputParameters = parameters;
} else {
this.parameters = parameters;
}
}
public void setInputParameters(List<Object> parameters) {
this.inputParameters = parameters;
}
public int getIndentCount() {
@@ -366,15 +368,15 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
SQLBinaryOperator operator = x.getOperator();
if (parameters != null
&& parameters.size() > 0
if (inputParameters != null
&& inputParameters.size() > 0
&& operator == SQLBinaryOperator.Equality
&& x.getRight() instanceof SQLVariantRefExpr
) {
SQLVariantRefExpr right = (SQLVariantRefExpr) x.getRight();
int index = right.getIndex();
if (index >= 0 && index < parameters.size()) {
Object param = parameters.get(index);
if (index >= 0 && index < inputParameters.size()) {
Object param = inputParameters.get(index);
if (param instanceof Collection) {
x.getLeft().accept(this);
print0(" IN (");
@@ -1530,12 +1532,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
public boolean visit(SQLVariantRefExpr x) {
int index = x.getIndex();
if (index < 0 || parameters == null || index >= parameters.size()) {
if (index < 0 || inputParameters == null || index >= inputParameters.size()) {
print0(x.getName());
return false;
}
Object param = parameters.get(index);
Object param = inputParameters.get(index);
SQLObject parent = x.getParent();