diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java index 0ab238abf2..28baca960e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java @@ -28,8 +28,8 @@ public class SQLAssignItem extends SQLObjectImpl { } public SQLAssignItem(SQLExpr target, SQLExpr value){ - this.target = target; - this.value = value; + setTarget(target); + setValue(value); } public SQLExpr getTarget() { @@ -37,6 +37,9 @@ public class SQLAssignItem extends SQLObjectImpl { } public void setTarget(SQLExpr target) { + if (target != null) { + target.setParent(this); + } this.target = target; } @@ -45,6 +48,9 @@ public class SQLAssignItem extends SQLObjectImpl { } public void setValue(SQLExpr value) { + if (value != null) { + value.setParent(this); + } this.value = value; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ParameterizedOutputVisitor.java index 7f3d9d0970..eba6bfe4f6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ParameterizedOutputVisitor.java @@ -55,7 +55,7 @@ public class DB2ParameterizedOutputVisitor extends DB2OutputVisitor implements P } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -63,7 +63,7 @@ public class DB2ParameterizedOutputVisitor extends DB2OutputVisitor implements P } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -71,7 +71,7 @@ public class DB2ParameterizedOutputVisitor extends DB2OutputVisitor implements P } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -79,7 +79,7 @@ public class DB2ParameterizedOutputVisitor extends DB2OutputVisitor implements P } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 272ccecfe9..007778a8eb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -2089,7 +2089,7 @@ public class MySqlStatementParser extends SQLStatementParser { } else { SQLSetStatement stmt = new SQLSetStatement(); - parseAssignItems(stmt.getItems()); + parseAssignItems(stmt.getItems(), stmt); if (global != null && global.booleanValue()) { SQLVariantRefExpr varRef = (SQLVariantRefExpr) stmt.getItems().get(0).getTarget(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java index ff4d22a253..2ffe1f754c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java @@ -136,7 +136,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -144,7 +144,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -152,7 +152,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -160,7 +160,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 485873bd42..b245b5d8f7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -583,7 +583,7 @@ public class OracleStatementParser extends SQLStatementParser { OracleAlterSessionStatement stmt = new OracleAlterSessionStatement(); if (lexer.token() == Token.SET) { lexer.nextToken(); - parseAssignItems(stmt.getItems()); + parseAssignItems(stmt.getItems(), stmt); } else { throw new ParserException("TODO : " + lexer.token() + " " + lexer.stringVal()); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java index a13b77c4de..adf0d69f26 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java @@ -59,7 +59,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor implem } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -67,7 +67,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor implem } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -77,7 +77,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor implem } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -85,7 +85,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor implem } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGParameterizedOutputVisitor.java index 6baabdb793..7e2f991f96 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGParameterizedOutputVisitor.java @@ -55,7 +55,7 @@ public class PGParameterizedOutputVisitor extends PGOutputVisitor implements Par } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -63,7 +63,7 @@ public class PGParameterizedOutputVisitor extends PGOutputVisitor implements Par } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -71,7 +71,7 @@ public class PGParameterizedOutputVisitor extends PGOutputVisitor implements Par } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -79,7 +79,7 @@ public class PGParameterizedOutputVisitor extends PGOutputVisitor implements Par } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerParameterizedOutputVisitor.java index 2e5047daa5..299eb2cd18 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerParameterizedOutputVisitor.java @@ -51,7 +51,7 @@ public class SQLServerParameterizedOutputVisitor extends SQLServerOutputVisitor } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -59,7 +59,7 @@ public class SQLServerParameterizedOutputVisitor extends SQLServerOutputVisitor } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -67,7 +67,7 @@ public class SQLServerParameterizedOutputVisitor extends SQLServerOutputVisitor } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -75,7 +75,7 @@ public class SQLServerParameterizedOutputVisitor extends SQLServerOutputVisitor } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index e4aaafb898..b34e6b6c25 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -20,6 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLListExpr; @@ -1136,14 +1137,15 @@ public class SQLStatementParser extends SQLParser { accept(Token.SET); SQLSetStatement stmt = new SQLSetStatement(); - parseAssignItems(stmt.getItems()); + parseAssignItems(stmt.getItems(), stmt); return stmt; } - public void parseAssignItems(List items) { + public void parseAssignItems(List items, SQLObject parent) { for (;;) { SQLAssignItem item = exprParser.parseAssignItem(); + item.setParent(parent); items.add(item); if (lexer.token() == Token.COMMA) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitor.java index 98ccdfcf89..a1b01122d1 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitor.java @@ -53,7 +53,7 @@ public class ParameterizedOutputVisitor extends SQLASTOutputVisitor implements P } public boolean visit(SQLIntegerExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -61,7 +61,7 @@ public class ParameterizedOutputVisitor extends SQLASTOutputVisitor implements P } public boolean visit(SQLNumberExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -69,7 +69,7 @@ public class ParameterizedOutputVisitor extends SQLASTOutputVisitor implements P } public boolean visit(SQLCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } @@ -77,7 +77,7 @@ public class ParameterizedOutputVisitor extends SQLASTOutputVisitor implements P } public boolean visit(SQLNCharExpr x) { - if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + if (!ParameterizedOutputVisitorUtils.checkParameterize(x)) { return super.visit(x); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java index b024c4a4c7..40a1b023fc 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -30,6 +30,7 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLNCharExpr; import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; +import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.dialect.db2.visitor.DB2ParameterizedOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor; @@ -121,12 +122,7 @@ public class ParameterizedOutputVisitorUtils { } public static boolean visit(ParameterizedVisitor v, SQLIntegerExpr x) { - SQLObject parent = x.getParent(); - - if (parent instanceof SQLDataType // - || parent instanceof SQLColumnDefinition // - || parent instanceof SQLServerTop // - ) { + if (!checkParameterize(x)) { return SQLASTOutputVisitorUtils.visit(v, x); } @@ -136,9 +132,7 @@ public class ParameterizedOutputVisitorUtils { } public static boolean visit(ParameterizedVisitor v, SQLNumberExpr x) { - SQLObject parent = x.getParent(); - - if (parent instanceof SQLDataType) { + if (!checkParameterize(x)) { return SQLASTOutputVisitorUtils.visit(v, x); } @@ -153,6 +147,24 @@ public class ParameterizedOutputVisitorUtils { return false; } + public static boolean checkParameterize(SQLObject x) { + if (Boolean.TRUE.equals(x.getAttribute(ParameterizedOutputVisitorUtils.ATTR_PARAMS_SKIP))) { + return false; + } + + SQLObject parent = x.getParent(); + + if (parent instanceof SQLDataType // + || parent instanceof SQLColumnDefinition // + || parent instanceof SQLServerTop // + || parent instanceof SQLAssignItem // + ) { + return false; + } + + return true; + } + public static boolean visit(ParameterizedVisitor v, SQLNCharExpr x) { v.print('?'); v.incrementReplaceCunt(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java index 9ebecce55a..57b32a007f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java @@ -15,6 +15,7 @@ */ package com.alibaba.druid.sql.visitor; +import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; @@ -29,4 +30,17 @@ public class SQLASTOutputVisitorUtils { visitor.print(x.getNumber().toString()); return false; } + + public static boolean visit(PrintableVisitor visitor, SQLCharExpr x) { + visitor.print('\''); + + String text = x.getText(); + text = text.replaceAll("'", "''"); + text = text.replaceAll("\\\\", "\\\\"); + + visitor.print(text); + + visitor.print('\''); + return false; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_6.java new file mode 100644 index 0000000000..7160263274 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_6.java @@ -0,0 +1,36 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; + +public class MySqlParameterizedOutputVisitorTest_6 extends TestCase { + + public void test_0() throws Exception { + String sql = "SET autocommit=1"; + Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); + } + + public void test_1() throws Exception { + String sql = "SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;"; + Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); + } +}