From afdf17b1547591dc3a8804be76193e6b576a89e9 Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Wed, 22 Jul 2015 01:18:51 +0800 Subject: [PATCH] change sql format --- .../java/com/alibaba/druid/sql/SQLUtils.java | 4 +++- .../odps/visitor/OdpsOutputVisitor.java | 2 +- .../druid/bvt/sql/mysql/MySqlFormatTest.java | 3 +-- .../bvt/sql/odps/OdpsAddStatisticTest.java | 18 ++++++------------ .../odps/OdpsAlterTableAddPartitionTest.java | 3 +-- .../odps/OdpsAlterTableDisableLifecycle.java | 6 ++---- .../odps/OdpsAlterTableDropPartitionTest.java | 6 ++---- .../odps/OdpsAlterTableEnableLifecycle.java | 6 ++---- .../OdpsAlterTableRenamePartitionTest.java | 3 +-- .../sql/odps/OdpsAlterTableSetCommentTest.java | 3 +-- .../sql/odps/OdpsAlterTableSetLifecycle.java | 3 +-- .../bvt/sql/odps/OdpsAlterTableTouchTest.java | 6 ++---- .../druid/bvt/sql/odps/OdpsAlterViewTest.java | 3 +-- .../bvt/sql/odps/OdpsCreateTableTest.java | 4 ++-- .../druid/bvt/sql/odps/OdpsDropViewTest.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest10.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest15.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest16.java | 5 +++-- .../bvt/sql/odps/OdpsFormatCommentTest2.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest3.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest4.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest5.java | 9 +++------ .../bvt/sql/odps/OdpsFormatCommentTest6.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest7.java | 3 +-- .../bvt/sql/odps/OdpsFormatCommentTest9.java | 3 +-- .../druid/bvt/sql/odps/OdpsFormatTest.java | 3 +-- .../bvt/sql/odps/OdpsRemoveStatisticTest.java | 18 ++++++------------ .../bvt/sql/odps/OdpsSelectTest_mapjoin.java | 3 +-- .../druid/bvt/sql/postgresql/PGFormatTest.java | 3 +-- 29 files changed, 50 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 4f1c54f169..be5034a7ae 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -268,7 +268,9 @@ public class SQLUtils { if (i == statementList.size() - 1) { Boolean semi = (Boolean) stmt.getAttribute("format.semi"); if (semi != null && semi.booleanValue()) { - visitor.println(); + if (stmt.hasAfterComment()) { + visitor.println(); + } visitor.print(";"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java index f37403865c..91d90ebcc9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java @@ -79,7 +79,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis element.accept(this); if (i != size - 1) { - print(','); + print(","); } if (this.isPrettyFormat() && element.hasAfterComment()) { print(' '); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java index 03988e9d29..eac5b4bc6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java @@ -29,7 +29,6 @@ public class MySqlFormatTest extends TestCase { "\ta INT, \n" + // "\tb CHAR(20), \n" + // "\tINDEX(a)\n" + // - ")" // - + "\n;", SQLUtils.format(text, JdbcUtils.MYSQL)); + ");", SQLUtils.format(text, JdbcUtils.MYSQL)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java index 937ea11cfc..a4475face9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java @@ -9,37 +9,31 @@ import junit.framework.TestCase; public class OdpsAddStatisticTest extends TestCase { public void test_table_count() throws Exception { String sql = "add statistic tbl_shop table_count;"; - Assert.assertEquals("ADD STATISTIC tbl_shop TABLE_COUNT" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop TABLE_COUNT;", SQLUtils.formatOdps(sql)); } public void test_null_value() throws Exception { String sql = "add statistic tbl_shop null_value shop_name;"; - Assert.assertEquals("ADD STATISTIC tbl_shop NULL_VALUE shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop NULL_VALUE shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_sum() throws Exception { String sql = "add statistic tbl_shop column_sum shop_name;"; - Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_SUM shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_SUM shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_max() throws Exception { String sql = "add statistic tbl_shop column_max shop_name;"; - Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MAX shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MAX shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_min() throws Exception { String sql = "add statistic tbl_shop column_min shop_name;"; - Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MIN shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MIN shop_name;", SQLUtils.formatOdps(sql)); } public void test_expression_condition() throws Exception { String sql = "add statistic tbl_shop expression_condition tbl_shop='hangzhou';"; - Assert.assertEquals("ADD STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou'" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ADD STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou';", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java index 02749ced8f..5149cb0628 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java @@ -11,7 +11,6 @@ public class OdpsAlterTableAddPartitionTest extends TestCase { public void test_if() throws Exception { String sql = "alter table sale_detail add if not exists partition (sale_date='201312', region='hangzhou');"; Assert.assertEquals("ALTER TABLE sale_detail" // - + "\n\tADD IF NOT EXISTS PARTITION (sale_date = '201312', region = 'hangzhou')" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tADD IF NOT EXISTS PARTITION (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java index a1dc909162..b39fd35dc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java @@ -11,15 +11,13 @@ public class OdpsAlterTableDisableLifecycle extends TestCase { public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans DISABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" // - + "\n\tDISABLE LIFECYCLE" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tDISABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); } public void test_has_partition() throws Exception { String sql = "ALTER TABLE trans PARTITION(dt='20141111') DISABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" - + "\n\tPARTITION (dt = '20141111') DISABLE LIFECYCLE" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tPARTITION (dt = '20141111') DISABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java index 86caf43e97..132c7d1891 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java @@ -11,14 +11,12 @@ public class OdpsAlterTableDropPartitionTest extends TestCase { public void test_if() throws Exception { String sql = "alter table sale_detail drop if not exists partition (sale_date='201312', region='hangzhou');"; Assert.assertEquals("ALTER TABLE sale_detail" // - + "\n\tDROP IF NOT EXISTS PARTITION (sale_date = '201312', region = 'hangzhou')" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tDROP IF NOT EXISTS PARTITION (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql)); } public void test_purge() throws Exception { String sql = "alter table my_log drop partition (ds='20150618') purge;"; Assert.assertEquals("ALTER TABLE my_log" - + "\n\tDROP PARTITION (ds = '20150618') PURGE" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tDROP PARTITION (ds = '20150618') PURGE;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java index 51afefe1bf..5861cea9b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java @@ -11,15 +11,13 @@ public class OdpsAlterTableEnableLifecycle extends TestCase { public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans ENABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" // - + "\n\tENABLE LIFECYCLE" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tENABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); } public void test_has_partition() throws Exception { String sql = "ALTER TABLE trans PARTITION(dt='20141111') ENABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" - + "\n\tPARTITION (dt = '20141111') ENABLE LIFECYCLE" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tPARTITION (dt = '20141111') ENABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java index 5f601806fb..7d72caf0ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java @@ -12,7 +12,6 @@ public class OdpsAlterTableRenamePartitionTest extends TestCase { String sql = "alter table sale_detail partition (sale_date='201312', region='hangzhou')" + "\nrename to partition(sale_date='201313', region='hangzhou');"; Assert.assertEquals("ALTER TABLE sale_detail" - + "\n\tPARTITION (sale_date = '201312', region = 'hangzhou') RENAME TO PARTITION(sale_date = '201313', region = 'hangzhou')" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tPARTITION (sale_date = '201312', region = 'hangzhou') RENAME TO PARTITION(sale_date = '201313', region = 'hangzhou');", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java index 39b5fc2692..f9d6116381 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java @@ -11,7 +11,6 @@ public class OdpsAlterTableSetCommentTest extends TestCase { public void test_if() throws Exception { String sql = "alter table sale_detail set comment 'new coments for table sale_detail';"; Assert.assertEquals("ALTER TABLE sale_detail" // - + "\n\tSET COMMENT 'new coments for table sale_detail'" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tSET COMMENT 'new coments for table sale_detail';", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java index f4ea839ec8..f5fad3b589 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java @@ -11,7 +11,6 @@ public class OdpsAlterTableSetLifecycle extends TestCase { public void test_if() throws Exception { String sql = "alter table test_lifecycle set lifecycle 50;"; Assert.assertEquals("ALTER TABLE test_lifecycle" // - + "\n\tSET LIFECYCLE 50" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tSET LIFECYCLE 50;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java index 3bbe069f60..3c0c503a5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java @@ -11,14 +11,12 @@ public class OdpsAlterTableTouchTest extends TestCase { public void test_touch() throws Exception { String sql = "alter table test_lifecycle touch;"; Assert.assertEquals("ALTER TABLE test_lifecycle" // - + "\n\tTOUCH" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tTOUCH;", SQLUtils.formatOdps(sql)); } public void test_touch_partition() throws Exception { String sql = "alter table test_lifecycle touch PARTITION (dt='20141111');"; Assert.assertEquals("ALTER TABLE test_lifecycle" // - + "\n\tTOUCH PARTITION (dt = '20141111')" // - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tTOUCH PARTITION (dt = '20141111');", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java index 58da36c37a..13e6de864a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java @@ -10,7 +10,6 @@ public class OdpsAlterViewTest extends TestCase { public void test_if() throws Exception { String sql = "alter view view_name rename to new_view_name;"; - Assert.assertEquals("ALTER VIEW view_name RENAME TO new_view_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("ALTER VIEW view_name RENAME TO new_view_name;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java index 8d3fa00d1c..96905760d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java @@ -26,8 +26,8 @@ public class OdpsCreateTableTest extends TestCase { parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("CREATE TABLE IF NOT EXISTS sale_detailsale_detail ("// - + "\n\tshop_name STRING, "// - + "\n\tcustomer_id STRING, "// + + "\n\tshop_name STRING,"// + + "\n\tcustomer_id STRING,"// + "\n\ttotal_price DOUBLE"// + "\n)"// + "\nCOMMENT 'xxxx'"// diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java index 0923ee5a71..c7e8acfd84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java @@ -25,8 +25,7 @@ public class OdpsDropViewTest extends TestCase { public void test_column_comment() throws Exception { String sql = "drop view if exists view_name;"; - Assert.assertEquals("DROP VIEW IF EXISTS view_name" // - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("DROP VIEW IF EXISTS view_name;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java index 2e24125699..3b8ea66932 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java @@ -20,8 +20,7 @@ public class OdpsFormatCommentTest10 extends TestCase { + "\n\t\tf5," + "\n\t\tf6" + "\n\t)" - + "\nFROM xxx" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java index 8a2ace58a7..3d20d95d2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java @@ -15,8 +15,7 @@ public class OdpsFormatCommentTest15 extends TestCase { + "\nPARTITIONED BY (" + "\n\tds string," + "\n\thh string" - + "\n)" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n);", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java index 0a7ecb51c8..e0f2779055 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java @@ -1,5 +1,7 @@ package com.alibaba.druid.bvt.sql.odps; +import java.net.URLDecoder; + import org.junit.Assert; import com.alibaba.druid.sql.SQLUtils; @@ -24,8 +26,7 @@ public class OdpsFormatCommentTest16 extends TestCase { + "\nPARTITIONED BY (" + "\n\tds string, -- c_1" + "\n\thh string -- c_2" - + "\n)" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n);", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java index 13a7cc370c..108ad1db6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java @@ -20,8 +20,7 @@ public class OdpsFormatCommentTest2 extends TestCase { + "\n--[Update ]" + "\nSET odps.sql.mapper.split.size = 2048;" + "\nSELECT *" - + "\nFROM dual" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM dual;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java index 6a6043d29b..1d1b8e5254 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java @@ -23,8 +23,7 @@ public class OdpsFormatCommentTest3 extends TestCase { + "\nSELECT f1 -- aa"// + "\nFROM t0;"// + "\nSELECT f2 -- aa"// - + "\nFROM t1" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM t1;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java index b9dde8421a..d190465236 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java @@ -33,8 +33,7 @@ public class OdpsFormatCommentTest4 extends TestCase { + "\nSELECT f0, "// + "\n\tf1, "// + "\n\tf2"// - + "\nWHERE name RLIKE 'kk'" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nWHERE name RLIKE 'kk';", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java index a7086e7bb2..4c3d2caba1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java @@ -14,8 +14,7 @@ public class OdpsFormatCommentTest5 extends TestCase { ;// Assert.assertEquals("SELECT *" // + "\nFROM t -- xxxx" // - + "\nWHERE id > 0" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nWHERE id > 0;", SQLUtils.formatOdps(sql)); } public void test_column_comment_as() throws Exception { @@ -25,8 +24,7 @@ public class OdpsFormatCommentTest5 extends TestCase { ;// Assert.assertEquals("SELECT *" // + "\nFROM xxxx a -- xxxx" // - + "\nWHERE id > 0" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nWHERE id > 0;", SQLUtils.formatOdps(sql)); } @@ -42,7 +40,6 @@ public class OdpsFormatCommentTest5 extends TestCase { + "\n\t-- comment_xxx" // + "\n\tSELECT *" // + "\n\tFROM t" // - + "\n) a" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n) a;", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java index 4422238c98..d44c039f6a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java @@ -17,8 +17,7 @@ public class OdpsFormatCommentTest6 extends TestCase { Assert.assertEquals("SELECT *" + "\nFROM t" + "\nWHERE status = '20' -- comment xxx" - + "\n\tAND flag & 127 > 0 -- comment kkkkk" - + "\n;", SQLUtils.formatOdps(sql)); + + "\n\tAND flag & 127 > 0 -- comment kkkkk;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java index c1d3265d10..35e3ce13f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java @@ -16,8 +16,7 @@ public class OdpsFormatCommentTest7 extends TestCase { + "\nSELECT *" + "\nFROM table1;" + "\nSELECT *" - + "\nFROM table2" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM table2;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java index 51017e1e20..0460fbf3d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java @@ -12,8 +12,7 @@ public class OdpsFormatCommentTest9 extends TestCase { Assert.assertEquals("INSERT OVERWRITE TABLE ttt PARTITION (ds='20150710', hh='07')" + "\nSELECT tt_split(content, 60)" + "\n\tAS (f0, f1, f2, f3)" - + "\nFROM xxx" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java index f83c584fd9..16e43b3081 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java @@ -12,8 +12,7 @@ public class OdpsFormatTest extends TestCase { Assert.assertEquals("SELECT *" // + "\nFROM t1;" // + "\nSELECT *" // - + "\nFROM t2"// - + "\n;", SQLUtils.formatOdps(sql)); + + "\nFROM t2;", SQLUtils.formatOdps(sql)); } public void test_no_semi() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java index f29728dc99..89b3b7637e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java @@ -9,37 +9,31 @@ import junit.framework.TestCase; public class OdpsRemoveStatisticTest extends TestCase { public void test_table_count() throws Exception { String sql = "remove statistic tbl_shop table_count;"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop TABLE_COUNT" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop TABLE_COUNT;", SQLUtils.formatOdps(sql)); } public void test_null_value() throws Exception { String sql = "remove statistic tbl_shop null_value shop_name;"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop NULL_VALUE shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop NULL_VALUE shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_sum() throws Exception { String sql = "remove statistic tbl_shop column_sum shop_name;"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_SUM shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_SUM shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_max() throws Exception { String sql = "remove statistic tbl_shop column_max shop_name;"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MAX shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MAX shop_name;", SQLUtils.formatOdps(sql)); } public void test_column_min() throws Exception { String sql = "remove statistic tbl_shop column_min shop_name;"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MIN shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MIN shop_name;", SQLUtils.formatOdps(sql)); } public void test_expression_condition() throws Exception { String sql = "remove statistic tbl_shop expression_condition tbl_shop='hangzhou';"; - Assert.assertEquals("REMOVE STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou'" - + "\n;", SQLUtils.formatOdps(sql)); + Assert.assertEquals("REMOVE STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou';", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java index d61263211c..c8eaae18fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java @@ -34,8 +34,7 @@ public class OdpsSelectTest_mapjoin extends TestCase { + "\n\tb.customer_id, " + "\n\tb.total_price" + "\nFROM shop a" - + "\nJOIN sale_detail b ON a.shop_name = b.shop_name" - + "\n;", SQLUtils.formatOdps(sql)); + + "\nJOIN sale_detail b ON a.shop_name = b.shop_name;", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java index 3958c882bd..7cfdfc98d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java @@ -30,7 +30,6 @@ public class PGFormatTest extends TestCase { "\n\tfooid int," + // "\n\tfoosubid int," + // "\n\tfooname text" + // - "\n)" - + "\n;", formatedSql); + "\n);", formatedSql); } }