diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java index 290ecf17b1..506abc5582 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java @@ -166,30 +166,6 @@ public class SQLCreateViewStatement extends SQLStatementImpl implements SQLDDLSt this.force = force; } - public void output(StringBuffer buf) { - buf.append("CREATE VIEW "); - this.getName().output(buf); - - if (this.columns.size() > 0) { - buf.append(" ("); - for (int i = 0, size = this.columns.size(); i < size; ++i) { - if (i != 0) { - buf.append(", "); - } - this.columns.get(i).output(buf); - } - buf.append(")"); - } - - buf.append(" AS "); - this.subQuery.output(buf); - - if (this.with != null) { - buf.append(" WITH "); - buf.append(this.with.name()); - } - } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index e6ad078901..bacf82cd78 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -2480,8 +2480,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet x.getTableSource().accept(this); if (x.getColumns().size() > 0) { - println(); - print('('); + print0(" ("); incrementIndent(); println(); for (int i = 0; i < x.getColumns().size(); ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java index aeb1357b4f..c26d6ff587 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java @@ -67,13 +67,12 @@ public class OdpsCreateViewTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - Assert.assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // - + "\n(" // - + "\n\tf1 COMMENT 'aaaa', " // - + "\n\tf2 COMMENT 'bbb'" // - + "\n)" // - + "\nAS" // - + "\nSELECT *" // - + "\nFROM dual;", output); + Assert.assertEquals("CREATE VIEW IF NOT EXISTS sale_detail (\n" + + "\tf1 COMMENT 'aaaa', \n" + + "\tf2 COMMENT 'bbb'\n" + + ")\n" + + "AS\n" + + "SELECT *\n" + + "FROM dual;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java index ed77eefbf0..e18f3db269 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java @@ -40,8 +40,7 @@ public class OracleCreateViewTest0 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"SC0\".\"V_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"SC0\".\"V_001\" (\n" + "\t\"ID\", \n" + "\t\"GROUP_ID\", \n" + "\t\"IND_BY_ALL\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java index d5ac35c2b8..9c56c1e734 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java @@ -95,8 +95,7 @@ public class OracleCreateViewTest1 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"XBO\".\"VW_SCY\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"XBO\".\"VW_SCY\" (\n" + "\t\"ID\", \n" + "\t\"GMT_CREATE\", \n" + "\t\"GMT_MODIFIED\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java index 5b6d787dd7..6a6debed20 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java @@ -64,8 +64,7 @@ public class OracleCreateViewTest2 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"RMAN\".\"V_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"RMAN\".\"V_001\" (\n" + "\t\"DB_KEY\", \n" + "\t\"DB_ID\", \n" + "\t\"BS_KEY\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java index 1e7637064a..2720a37fa2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java @@ -65,8 +65,7 @@ public class OracleCreateViewTest3 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"RMAN\".\"V_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"RMAN\".\"V_001\" (\n" + "\t\"DB_KEY\", \n" + "\t\"DBINC_KEY\", \n" + "\t\"FILE#\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java index 4dd229510c..de3749955b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java @@ -57,8 +57,7 @@ public class OracleCreateViewTest4 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"V_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"V_001\" (\n" + "\t\"OBJ_OWNER\", \n" + "\t\"OBJ_NAME\", \n" + "\t\"OBJ_TYPE\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java index 39e3dae6bc..b5ee9e45ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java @@ -52,8 +52,7 @@ public class OracleCreateViewTest5 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"TB_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"TB_001\" (\n" + "\t\"OBJECT_NAME\", \n" + "\t\"SESSION_ID\", \n" + "\t\"ORACLE_USERNAME\", \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java index d391552cfd..1daa88a362 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java @@ -78,8 +78,7 @@ public class OracleCreateViewTest6 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"TV_001\"\n" + - "(\n" + + Assert.assertEquals("CREATE OR REPLACE VIEW \"SC_001\".\"TV_001\" (\n" + "\t\"ID\", \n" + "\t\"GMT_CREATE\", \n" + "\t\"CREATOR\", \n" +