Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

bug fixed for oracle sql parser.

Browse Source
This commit is contained in:
wenshao
2017-05-11 17:31:31 +08:00
parent 13c7228baf
commit fd817a5adf
4 changed files with 207 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
+1 -8
View File
@@ -1912,14 +1912,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
incrementIndent();
println();
for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
SQLStatement item = x.getStatements().get(i);
item.setParent(x);
item.accept(this);
if (i != size - 1) {
println();
}
}
printlnAndAccept(x.getStatements(), ";");
decrementIndent();
println();
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+6
View File
@@ -3303,10 +3303,16 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
incrementIndent();
println();
for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
SQLStatement item = x.getStatements().get(i);
item.setParent(x);
item.accept(this);
if (JdbcConstants.ORACLE.equals(dbType)) {
print(";");
}
if (i != size - 1) {
println();
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java
+103
View File
@@ -0,0 +1,103 @@
/*
* Copyright 1999-2017 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.oracle.pl;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class Oracle_pl_exit_0 extends OracleTest {
public void test_0() throws Exception {
String sql = "DECLARE\n" +
" x NUMBER := 0;\n" +
"BEGIN\n" +
" LOOP\n" +
" DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" +
" x := x + 1;\n" +
" IF x > 3 THEN\n" +
" EXIT;\n" +
" END IF;\n" +
" END LOOP;\n" +
" -- After EXIT, control resumes here\n" +
" DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" +
"END;"; //
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
SQLStatement stmt = statementList.get(0);
assertEquals(1, statementList.size());
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE);
for (SQLStatement statement : statementList) {
statement.accept(visitor);
}
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("relationships : " + visitor.getRelationships());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(0, visitor.getTables().size());
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name")));
// Assert.assertEquals(7, visitor.getColumns().size());
// Assert.assertEquals(3, visitor.getConditions().size());
// Assert.assertEquals(1, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
{
String output = SQLUtils.toOracleString(stmt);
assertEquals("DECLARE\n" +
"\tx NUMBER := 0;\n" +
"BEGIN\n" +
"\tLOOP\n" +
"\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" +
"\t\tx := x + 1;\n" +
"\t\tIF x > 3 THEN\n" +
"\t\t\tEXIT;\n" +
"\t\tEND IF;\n" +
"\tEND LOOP;\n" +
"\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" +
"END", //
output);
}
{
String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
assertEquals("declare\n" +
"\tx NUMBER := 0;\n" +
"begin\n" +
"\tloop\n" +
"\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" +
"\t\tx := x + 1;\n" +
"\t\tif x > 3 then\n" +
"\t\t\texit;\n" +
"\t\tend if;\n" +
"\tend loop;\n" +
"\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" +
"end", //
output);
}
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java
+97
View File
@@ -0,0 +1,97 @@
/*
* Copyright 1999-2017 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.oracle.pl;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class Oracle_pl_exit_1 extends OracleTest {
public void test_0() throws Exception {
String sql = "DECLARE\n" +
" x NUMBER := 0;\n" +
"BEGIN\n" +
" LOOP\n" +
" DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" +
" x := x + 1; -- prevents infinite loop\n" +
" EXIT WHEN x > 3;\n" +
" END LOOP;\n" +
" -- After EXIT statement, control resumes here\n" +
" DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" +
"END;"; //
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
SQLStatement stmt = statementList.get(0);
assertEquals(1, statementList.size());
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE);
for (SQLStatement statement : statementList) {
statement.accept(visitor);
}
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("relationships : " + visitor.getRelationships());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(0, visitor.getTables().size());
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name")));
// Assert.assertEquals(7, visitor.getColumns().size());
// Assert.assertEquals(3, visitor.getConditions().size());
// Assert.assertEquals(1, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
{
String output = SQLUtils.toOracleString(stmt);
assertEquals("DECLARE\n" +
"\tx NUMBER := 0;\n" +
"BEGIN\n" +
"\tLOOP\n" +
"\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" +
"\t\tx := x + 1;\n" +
"\t\tEXIT WHEN x > 3;\n" +
"\tEND LOOP;\n" +
"\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" +
"END", //
output);
}
{
String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
assertEquals("declare\n" +
"\tx NUMBER := 0;\n" +
"begin\n" +
"\tloop\n" +
"\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" +
"\t\tx := x + 1;\n" +
"\t\texit when x > 3;\n" +
"\tend loop;\n" +
"\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" +
"end", //
output);
}
}
}