From 413be781fb8cc1cade461756cb5851d0b520c86a Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 23 Jun 2011 01:48:21 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@280 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../druid/jconsole/SQLDetailDialog.java | 2 +- .../druid/sql/ast/SQLDataTypeImpl.java | 2 +- .../druid/sql/ast/SQLStatementImpl.java | 2 +- .../druid/sql/ast/expr/SQLBinaryOperator.java | 1 + .../sql/ast/expr/SQLMethodInvokeExpr.java | 2 +- .../sql/ast/expr/SQLObjectCreateExpr.java | 2 +- .../MySqlParameterizedOutputVisitor.java | 6 ++- .../mysql/visitor/MySqlSchemaStatVisitor.java | 2 + .../oracle/ast/OracleDataTypeInterval.java | 2 +- .../sql/dialect/oracle/ast/OracleHint.java | 2 +- .../sql/dialect/oracle/ast/OracleOrderBy.java | 2 +- .../dialect/oracle/ast/OracleSQLObject.java | 2 +- .../oracle/ast/clause/CycleClause.java | 2 +- .../ast/clause/FlashbackQueryClause.java | 2 +- .../oracle/ast/clause/GroupingSetExpr.java | 2 +- .../ast/clause/PartitionExtensionClause.java | 2 +- .../oracle/ast/clause/SampleClause.java | 2 +- .../oracle/ast/clause/SearchClause.java | 2 +- .../ast/clause/SubqueryFactoringClause.java | 2 +- .../oracle/ast/expr/OracleAggregateExpr.java | 2 +- .../oracle/ast/expr/OracleAnalytic.java | 2 +- .../ast/expr/OracleAnalyticWindowing.java | 2 +- .../ast/expr/OracleArrayAccessExpr.java | 2 +- .../ast/expr/OracleBinaryDoubleExpr.java | 2 +- .../ast/expr/OracleBinaryFloatExpr.java | 2 +- .../oracle/ast/expr/OracleDateExpr.java | 2 +- .../oracle/ast/expr/OracleDbLinkExpr.java | 2 +- .../oracle/ast/expr/OracleExtractExpr.java | 2 +- .../expr/OracleGroupComparisonCondition.java | 2 +- .../ast/expr/OracleGroupingSetsExpr.java | 2 +- .../oracle/ast/expr/OracleIntervalExpr.java | 2 +- .../oracle/ast/expr/OracleOuterExpr.java | 2 +- .../oracle/ast/expr/OraclePriorExpr.java | 2 +- .../ast/expr/OracleTableCollectionExpr.java | 2 +- .../oracle/ast/expr/OracleTimestampExpr.java | 2 +- .../ast/stmt/OracleAlterTableStatement.java | 2 +- .../dialect/oracle/ast/stmt/OracleCheck.java | 2 +- .../oracle/ast/stmt/OracleConstraintNull.java | 2 +- .../ast/stmt/OracleConstraintState.java | 2 +- .../ast/stmt/OracleCreateViewStatement.java | 2 +- .../ast/stmt/OracleDeleteStatement.java | 2 +- .../oracle/ast/stmt/OracleForeignKey.java | 2 +- .../oracle/ast/stmt/OracleOrderByItem.java | 2 +- .../ast/stmt/OraclePLSQLCommitStatement.java | 2 +- .../oracle/ast/stmt/OraclePrimaryKey.java | 2 +- .../oracle/ast/stmt/OracleRefDataType.java | 2 +- .../ast/stmt/OracleReferencesConstaint.java | 2 +- .../dialect/oracle/ast/stmt/OracleSelect.java | 2 +- .../ast/stmt/OracleSelectForUpdate.java | 2 +- .../OracleSelectHierachicalQueryClause.java | 2 +- .../oracle/ast/stmt/OracleSelectJoin.java | 2 +- .../oracle/ast/stmt/OracleSelectPivot.java | 2 +- .../ast/stmt/OracleSelectQueryBlock.java | 2 +- .../ast/stmt/OracleSelectRestriction.java | 2 +- .../stmt/OracleSelectSubqueryTableSource.java | 2 +- .../ast/stmt/OracleSelectTableReference.java | 2 +- .../oracle/ast/stmt/OracleSelectUnPivot.java | 2 +- .../oracle/ast/stmt/OracleTableColumn.java | 2 +- .../oracle/ast/stmt/OracleTableExpr.java | 2 +- .../oracle/ast/stmt/OracleTableTypeDef.java | 2 +- .../ast/stmt/OracleUpdateSetListClause.java | 2 +- .../OracleUpdateSetListMultiColumnItem.java | 2 +- .../OracleUpdateSetListSingleColumnItem.java | 2 +- .../ast/stmt/OracleUpdateSetValueClause.java | 2 +- .../ast/stmt/OracleUpdateStatement.java | 2 +- .../visitor/OracleASTVIsitorAdapter.java | 2 +- .../{ast => }/visitor/OracleASTVisitor.java | 2 +- .../visitor/OracleOutputVisitor.java | 2 +- .../OracleParameterizedOutputVisitor.java | 8 ++-- .../visitor/OracleSchemaStatVisitor.java | 43 ++++++++++++------- .../druid/sql/parser/SQLExprParser.java | 8 +++- .../com/alibaba/druid/sql/OnlineSQLTest.java | 2 +- .../MySqlParameterizedOutputVisitorTest.java | 2 +- .../bvt/parser/MySqlParserResourceTest.java | 2 + .../bvt/OracleSQLParserResourceTest.java | 2 +- .../sql/oracle/bvt/OracleSQLParserTest.java | 2 +- .../oracle/bvt/OracleSelectParserTest.java | 2 +- .../bvt/visitor/OracleResourceTest.java | 4 +- .../visitor/OracleSchemaStatVisitorTest1.java | 2 +- .../visitor/OracleSchemaStatVisitorTest2.java | 2 +- .../visitor/OracleSchemaStatVisitorTest3.java | 2 +- .../visitor/OracleSchemaStatVisitorTest4.java | 2 +- .../OracleSchemaStatVisitorTest_Delete.java | 2 +- .../OracleSchemaStatVisitorTest_Subquery.java | 2 +- ...OracleSchemaStatVisitorTest_Subquery2.java | 2 +- .../OracleSchemaStatVisitorTest_Update.java | 2 +- .../alibaba/druid/sql/oracle/demo/Demo0.java | 2 +- .../alibaba/druid/sql/parser/CommentTest.java | 2 +- .../alibaba/druid/sql/parser/PerfTest.java | 2 +- .../druid/sql/parser/SQLMergeTest.java | 2 +- src/test/resources/bvt/parser/mysql-11.txt | 5 +++ src/test/resources/bvt/parser/mysql-12.txt | 5 +++ 92 files changed, 143 insertions(+), 105 deletions(-) rename src/main/java/com/alibaba/druid/sql/dialect/oracle/{ast => }/visitor/OracleASTVIsitorAdapter.java (99%) rename src/main/java/com/alibaba/druid/sql/dialect/oracle/{ast => }/visitor/OracleASTVisitor.java (99%) rename src/main/java/com/alibaba/druid/sql/dialect/oracle/{ast => }/visitor/OracleOutputVisitor.java (99%) rename src/main/java/com/alibaba/druid/sql/dialect/oracle/{ast => }/visitor/OracleParameterizedOutputVisitor.java (93%) rename src/main/java/com/alibaba/druid/sql/dialect/oracle/{ast => }/visitor/OracleSchemaStatVisitor.java (97%) create mode 100644 src/test/resources/bvt/parser/mysql-11.txt create mode 100644 src/test/resources/bvt/parser/mysql-12.txt diff --git a/src/main/java/com/alibaba/druid/jconsole/SQLDetailDialog.java b/src/main/java/com/alibaba/druid/jconsole/SQLDetailDialog.java index 265fe6efcf..0e08f28333 100644 --- a/src/main/java/com/alibaba/druid/jconsole/SQLDetailDialog.java +++ b/src/main/java/com/alibaba/druid/jconsole/SQLDetailDialog.java @@ -12,8 +12,8 @@ import org.springframework.util.Assert; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class SQLDetailDialog extends JDialog { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java index c5ea85e40a..d52e151a2d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java index 00e59eac0d..a5d8f5b151 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.ast; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class SQLStatementImpl extends SQLObjectImpl implements SQLStatement { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java index 95d448233c..9affa9cb6a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java @@ -38,6 +38,7 @@ public enum SQLBinaryOperator { BitwiseAnd("&", 90), BitwiseOr("|", 100), + InvertBits("~", 100), GreaterThan(">", 110), GreaterThanOrEqual(">=", 110), diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java index 85e55edd44..a49ddd3e5f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLMethodInvokeExpr extends SQLExprImpl implements Serializable { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLObjectCreateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLObjectCreateExpr.java index db33354bf4..9669aea53e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLObjectCreateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLObjectCreateExpr.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLObjectCreateExpr extends SQLExprImpl implements Serializable { 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 feb8404b3a..bec84a1030 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 @@ -44,8 +44,10 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor { public SQLBinaryOpExpr merge(SQLBinaryOpExpr x) { if (x.getLeft() instanceof SQLLiteralExpr && x.getRight() instanceof SQLLiteralExpr) { - x.getLeft().getAttributes().put(ATTR_PARAMS_SKIP, true); - x.getRight().getAttributes().put(ATTR_PARAMS_SKIP, true); + if (x.getOperator() == SQLBinaryOperator.Equality || x.getOperator() == SQLBinaryOperator.NotEqual) { + x.getLeft().getAttributes().put(ATTR_PARAMS_SKIP, true); + x.getRight().getAttributes().put(ATTR_PARAMS_SKIP, true); + } return x; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index a516c55c54..4af00a6f7f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -80,6 +80,8 @@ public class MySqlSchemaStatVisitor extends MySqlASTVisitorAdapter { } aliasMap.put(ident, ident); } + } else { + accept(x.getExpr()); } return false; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeInterval.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeInterval.java index 11c38a1adc..9b627d64c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeInterval.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeInterval.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalType; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDataTypeInterval extends SQLDataTypeImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleHint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleHint.java index fb1f01fc9b..10677cb366 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleHint.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleHint extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java index c6e8234ae7..672e958306 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleOrderByItem; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOrderBy extends SQLOrderBy { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java index 2566c87081..cd2f5ef6ec 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleSQLObject extends SQLObjectImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java index ac5ed6cbbb..8e3a2081bb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class CycleClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java index 97bd73f214..f6b8dbe514 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java @@ -2,7 +2,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.clause; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public abstract class FlashbackQueryClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java index e7edc4a1b3..8f7d6e4784 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class GroupingSetExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java index 0f7148eb56..2bb0d066b0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class PartitionExtensionClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java index 6e6e988e6f..7bec641124 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java @@ -2,7 +2,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.clause; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class SampleClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java index 6141af47ab..baae4966fc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java @@ -6,7 +6,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleOrderByItem; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class SearchClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SubqueryFactoringClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SubqueryFactoringClause.java index e4f27a484d..e8855d810c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SubqueryFactoringClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SubqueryFactoringClause.java @@ -7,7 +7,7 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class SubqueryFactoringClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java index 5fa5c6ff7d..0df86717d4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java @@ -20,7 +20,7 @@ import java.io.Serializable; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleAggregateExpr extends SQLAggregateExpr implements Serializable { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java index 3a67dc85cb..93dd17a9b3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.ast.OracleOrderBy; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleAnalytic extends SQLObjectImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java index 499dca321a..3321995e15 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @SuppressWarnings("serial") diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java index 76bea60cf3..fb02a7cd51 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleArrayAccessExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java index 3f94f23c0c..044e280941 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java @@ -1,7 +1,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleBinaryDoubleExpr extends SQLNumericLiteralExpr { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java index 46b8097b5f..d1f043760f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java @@ -1,7 +1,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleBinaryFloatExpr extends SQLNumericLiteralExpr { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java index cad3f90beb..44eca0c7a4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDateExpr extends SQLLiteralExpr { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java index d3cb932c91..3ad8fa8b8b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDbLinkExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java index 5872bee307..076dbe8502 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleExtractExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java index 8d95cb8b3c..8538517c9e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleGroupComparisonCondition extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java index aba235420b..24fd827787 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleGroupingSetsExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java index 14e02eabcc..67928f8ae0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleIntervalExpr extends SQLLiteralExpr { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java index 0861d3aac6..2709215292 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOuterExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java index 8a65dc3002..e6b1b675c5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java @@ -2,7 +2,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OraclePriorExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java index 921ce10f0f..eb8a315833 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTableCollectionExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java index ce82385aeb..1b3b4118c9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTimestampExpr extends SQLLiteralExpr { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java index be3ce84414..5221e77ea6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java @@ -24,7 +24,7 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleAlterTableStatement extends SQLStatementImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java index 106373b16a..8b8f488119 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleCheck extends OracleConstraint { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintNull.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintNull.java index 052887e9e0..a12b350633 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintNull.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintNull.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleConstraintNull extends OracleConstraint { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java index 1a0d0649b4..52ee56a9b0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleConstraintState extends SQLObjectImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateViewStatement.java index 408936ad08..8f9ad91dbc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateViewStatement.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCreateViewStatement extends SQLCreateViewStatement { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java index b4c038d0ab..473f982e93 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; import com.alibaba.druid.sql.dialect.oracle.ast.OracleHint; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDeleteStatement extends SQLDeleteStatement { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java index ea219e2882..a74b4fcac3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleForeignKey extends OracleConstraint { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java index a231341f92..5a1e03cdcf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOrderByItem extends SQLSelectOrderByItem { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java index 0c50602470..9f8a80179e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OraclePLSQLCommitStatement extends SQLStatementImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java index 8e4d5875b5..47bd64da54 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OraclePrimaryKey extends OracleConstraint { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRefDataType.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRefDataType.java index a7aaa83b76..dc96e2dadd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRefDataType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRefDataType.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleRefDataType extends SQLDataTypeImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleReferencesConstaint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleReferencesConstaint.java index a51b81d9ee..ef5063d4ca 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleReferencesConstaint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleReferencesConstaint.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleReferencesConstaint extends OracleConstraint { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java index 8444df561f..280965e9f7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.dialect.oracle.ast.clause.SubqueryFactoringClause; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelect extends SQLSelect { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java index 002c30d064..c9315009c2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectForUpdate extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java index 1ca5f6411a..ec6a82ca9c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectHierachicalQueryClause extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java index a6da90f432..c615570b95 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectJoin extends SQLJoinTableSource implements OracleSelectTableSource { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java index c110f94165..0db5337faf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectPivot extends OracleSelectPivotBase { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java index c808993d81..6c3500ac99 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java @@ -22,7 +22,7 @@ import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.dialect.oracle.ast.OracleHint; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectQueryBlock extends SQLSelectQueryBlock { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java index c190a57b9c..6b2fbc1ca0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public abstract class OracleSelectRestriction extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java index 5c061e89d3..79accd0857 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectSubqueryTableSource extends SQLSubqueryTableSource implements OracleSelectTableSource { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java index 908c5c7d2d..e17f8507a0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java @@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.oracle.ast.clause.FlashbackQueryClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.PartitionExtensionClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.SampleClause; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectTableReference extends SQLExprTableSource implements OracleSelectTableSource { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java index fc9199b556..a57cf43203 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectPivot.Item; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectUnPivot extends OracleSelectPivotBase { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableColumn.java index 5d705598df..5ce665c266 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableColumn.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableColumn.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleTableColumn extends OracleSQLObject { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableExpr.java index 300a2a29fd..c77e4ecb3a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableExpr.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTableExpr extends SQLExprImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableTypeDef.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableTypeDef.java index 036241398e..2eab8ec877 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableTypeDef.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTableTypeDef.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleTableTypeDef extends OracleTypeDef { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListClause.java index b7969869e8..87cc55e3e8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListClause.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleUpdateSetListClause extends OracleUpdateSetClause { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListMultiColumnItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListMultiColumnItem.java index f977fed04e..e488ca4be7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListMultiColumnItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListMultiColumnItem.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleUpdateSetListMultiColumnItem extends OracleUpdateSetListItem { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListSingleColumnItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListSingleColumnItem.java index 3437814aa1..c09dbdd82a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListSingleColumnItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetListSingleColumnItem.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleUpdateSetListSingleColumnItem extends OracleUpdateSetListItem { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetValueClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetValueClause.java index 43d0d5d78e..5a309093d0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetValueClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateSetValueClause.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleUpdateSetValueClause extends OracleUpdateSetClause { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java index 7042350b12..317bc04ae1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.dialect.oracle.ast.OracleHint; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleUpdateStatement extends SQLStatementImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVIsitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java similarity index 99% rename from src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVIsitorAdapter.java rename to src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java index 11e46a5e67..b0e57317c7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVIsitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.sql.dialect.oracle.ast.visitor; +package com.alibaba.druid.sql.dialect.oracle.visitor; import com.alibaba.druid.sql.ast.expr.SQLObjectCreateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeInterval; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java similarity index 99% rename from src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVisitor.java rename to src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java index 501cf14b43..4768cad6b9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.sql.dialect.oracle.ast.visitor; +package com.alibaba.druid.sql.dialect.oracle.visitor; import com.alibaba.druid.sql.ast.expr.SQLObjectCreateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeInterval; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java similarity index 99% rename from src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java rename to src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index c82b276c7b..f165d78f29 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.sql.dialect.oracle.ast.visitor; +package com.alibaba.druid.sql.dialect.oracle.visitor; import java.util.List; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java similarity index 93% rename from src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleParameterizedOutputVisitor.java rename to src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java index 7215b15922..0095e80939 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.sql.dialect.oracle.ast.visitor; +package com.alibaba.druid.sql.dialect.oracle.visitor; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; @@ -42,8 +42,10 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor { public SQLBinaryOpExpr merge(SQLBinaryOpExpr x) { if (x.getLeft() instanceof SQLLiteralExpr && x.getRight() instanceof SQLLiteralExpr) { - x.getLeft().getAttributes().put(ATTR_PARAMS_SKIP, true); - x.getRight().getAttributes().put(ATTR_PARAMS_SKIP, true); + if (x.getOperator() == SQLBinaryOperator.Equality || x.getOperator() == SQLBinaryOperator.NotEqual) { + x.getLeft().getAttributes().put(ATTR_PARAMS_SKIP, true); + x.getRight().getAttributes().put(ATTR_PARAMS_SKIP, true); + } return x; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java similarity index 97% rename from src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java rename to src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java index 2655fd37ee..579bfb6473 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.sql.dialect.oracle.ast.visitor; +package com.alibaba.druid.sql.dialect.oracle.visitor; import java.util.HashMap; import java.util.HashSet; @@ -86,6 +86,8 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { } aliasMap.put(ident, ident); } + } else { + accept(x.getExpr()); } return false; @@ -125,22 +127,25 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { } aliasMap.put(ident, ident); } + return false; } + + accept(x.getExpr()); return false; } - + public boolean visit(SQLAggregateExpr x) { accept(x.getArguments()); return false; } - + public boolean visit(OracleAggregateExpr x) { accept(x.getArguments()); accept(x.getOver()); return false; } - + public boolean visit(SQLMethodInvokeExpr x) { accept(x.getParameters()); return false; @@ -148,35 +153,35 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { public boolean visit(SQLSelect x) { accept(x.getQuery()); - + String originalTable = currentTableLocal.get(); - + currentTableLocal.set((String) x.getQuery().getAttribute("table")); x.putAttribute("_old_local_", originalTable); - + accept(x.getOrderBy()); - + currentTableLocal.set(originalTable); - + return false; } public void endVisit(OracleSelect x) { } - + public boolean visit(OracleSelect x) { accept(x.getFactoring()); accept(x.getQuery()); - + String originalTable = currentTableLocal.get(); - + currentTableLocal.set((String) x.getQuery().getAttribute("table")); x.putAttribute("_old_local_", originalTable); - + accept(x.getOrderBy()); - + currentTableLocal.set(originalTable); - + return false; } @@ -411,6 +416,14 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter { return false; } + if ("SYSDATE".equalsIgnoreCase(x.getName())) { + return false; + } + + if ("+".equalsIgnoreCase(x.getName())) { + return false; + } + String currentTable = currentTableLocal.get(); if (currentTable != null) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index ccb3398bf3..ddd502a61b 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -654,10 +654,16 @@ public class SQLExprParser extends SQLParser { } public final SQLExpr bitOrRest(SQLExpr expr) throws ParserException { - while (lexer.token() == Token.BAR) { + if (lexer.token() == Token.BAR) { lexer.nextToken(); SQLExpr rightExp = bitAnd(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BitwiseOr, rightExp); + expr = bitAndRest(expr); + } else if (lexer.token() == Token.TILDE) { + lexer.nextToken(); + SQLExpr rightExp = bitAnd(); + expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.InvertBits, rightExp); + expr = bitAndRest(expr); } return expr; } diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 6b3ebdf3a1..600b2a9aa4 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -14,8 +14,8 @@ import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleParameterizedOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVisitor; public class OnlineSQLTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java index cb313ec358..d65b0f41ed 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java @@ -8,8 +8,8 @@ import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleParameterizedOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVisitor; public class MySqlParameterizedOutputVisitorTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java b/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java index 10a77c8b6a..fea4c6d665 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java @@ -28,6 +28,8 @@ public class MySqlParserResourceTest extends TestCase { exec_test("bvt/parser/mysql-8.txt"); exec_test("bvt/parser/mysql-9.txt"); exec_test("bvt/parser/mysql-10.txt"); + exec_test("bvt/parser/mysql-11.txt"); + exec_test("bvt/parser/mysql-12.txt"); } public void exec_test(String resource) throws Exception { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java index 8435cb1fc4..b57c5982bf 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java @@ -9,8 +9,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.util.JdbcUtils; public class OracleSQLParserResourceTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java index 8126eae319..fcf511d674 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java @@ -12,8 +12,8 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateSetListClause; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateSetListSingleColumnItem; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class OracleSQLParserTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java index fc7bbcfae0..6d2ad3a000 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java @@ -20,8 +20,8 @@ import java.util.List; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class OracleSelectParserTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java index 476d7587b8..1258c527af 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java @@ -12,15 +12,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; public class OracleResourceTest extends TestCase { public void test_0() throws Exception { // 13 - exec_test("bvt/parser/oracle-29.txt"); + exec_test("bvt/parser/oracle-53.txt"); // for (int i = 0; i <= 53; ++i) { // exec_test("bvt/parser/oracle-" + i + ".txt"); // } diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java index 48192bbe12..7474cbb654 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest1 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java index 436bab940f..65cdae1367 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest2 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java index 9e45bfcd80..8dbd37cd8b 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest3 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java index 3942df8484..43f4eb6578 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest4 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java index 08a64103e4..fee33ec826 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Delete extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java index 00182bf64a..a64aaf87ea 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Subquery extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java index 96ca9ec30f..0d3f135c4d 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java index 76e2c65e8b..3c0ad32f6a 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java @@ -6,8 +6,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Update extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java index c5e6957d1a..01311d0bd4 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java @@ -20,8 +20,8 @@ import java.util.List; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo0 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java index 0aeaaf1860..42cd2edbca 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java @@ -5,8 +5,8 @@ import java.util.List; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class CommentTest extends TestCase { public void test_0 () throws Exception { diff --git a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java index 73a4c16604..79005abc29 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java @@ -10,8 +10,8 @@ import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.util.JdbcUtils; public class PerfTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java index aedd10ca04..1946586381 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java @@ -9,8 +9,8 @@ import com.alibaba.druid.sql.ast.expr.SQLInListExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class SQLMergeTest extends TestCase { diff --git a/src/test/resources/bvt/parser/mysql-11.txt b/src/test/resources/bvt/parser/mysql-11.txt new file mode 100644 index 0000000000..8c3630d80c --- /dev/null +++ b/src/test/resources/bvt/parser/mysql-11.txt @@ -0,0 +1,5 @@ +SELECT 5 & ~1 +--------------------------- +SELECT 5 & ~1 +--------------------------- +SELECT ? & ~? diff --git a/src/test/resources/bvt/parser/mysql-12.txt b/src/test/resources/bvt/parser/mysql-12.txt new file mode 100644 index 0000000000..2a82e96118 --- /dev/null +++ b/src/test/resources/bvt/parser/mysql-12.txt @@ -0,0 +1,5 @@ +SELECT 4 >> 2 +--------------------------- +SELECT 4 >> 2 +--------------------------- +SELECT ? >> ?