Merge pull request #942 from wenshao/master

improved odps sql formatter

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java

@@ -19,6 +19,7 @@ public class OdpsFormatCommentTest2 extends TestCase {
                 + "\n--[Created -2015-06-10 13:19:18]"
                 + "\n--[Update ]"
                 + "\nSET odps.sql.mapper.split.size = 2048;"
+                + "\n" //
                 + "\nSELECT *"
                 + "\nFROM dual;", SQLUtils.formatOdps(sql));
     }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java

@@ -20,8 +20,10 @@ public class OdpsFormatCommentTest3 extends TestCase {
                 + "\nSET odps.service.mode = all;"//
                 + "\n-- 使用新引擎"//
                 + "\nSET odps.nvm.enabled = true;"//
+                + "\n" //
                 + "\nSELECT f1 -- aa"//
                 + "\nFROM t0;"//
+                + "\n" //
                 + "\nSELECT f2 -- aa"//
                 + "\nFROM t1;", SQLUtils.formatOdps(sql));
     }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java

@@ -15,6 +15,7 @@ public class OdpsFormatCommentTest7 extends TestCase {
         Assert.assertEquals("--这里是注释"
                 + "\nSELECT *"
                 + "\nFROM table1;"
+                + "\n"
                 + "\nSELECT *"
                 + "\nFROM table2;", SQLUtils.formatOdps(sql));
     }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java

@@ -15,9 +15,11 @@ public class OdpsFormatCommentTest8 extends TestCase {
                 ;//
         Assert.assertEquals("SELECT *"
                 + "\nFROM table1;"
+                + "\n"
                 + "\n--comment1 goes here"
                 + "\nSELECT *"
                 + "\nFROM table2;"
+                + "\n"
                 + "\nSELECT *"
                 + "\nFROM table3;--comment2 goes here", SQLUtils.formatOdps(sql));
     }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java

@@ -11,6 +11,7 @@ public class OdpsFormatTest extends TestCase {
         String sql = "select * from t1; ;select * from t2;";
         Assert.assertEquals("SELECT *" //
                 + "\nFROM t1;" //
+                + "\n"
                 + "\nSELECT *" //
                 + "\nFROM t2;", SQLUtils.formatOdps(sql));
     }
@@ -19,6 +20,7 @@ public class OdpsFormatTest extends TestCase {
         String sql = "select * from t1; ;select * from t2";
         Assert.assertEquals("SELECT *" //
                 + "\nFROM t1;" //
+                + "\n"
                 + "\nSELECT *" //
                 + "\nFROM t2", SQLUtils.formatOdps(sql));
     }

src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java

@@ -36,5 +36,12 @@ public class OdpsSelectTest extends TestCase {
                             + "\nFROM sale_detail" //
                             + "\nDISTRIBUTE BY region SORT BY f1;", SQLUtils.formatOdps(sql));
     }
+    
+    public void test_distribute_by_2() throws Exception {
+        String sql = " select region from sale_detail distribute by region sort by f1 asc;";//
+        Assert.assertEquals("SELECT region" //
+                            + "\nFROM sale_detail" //
+                            + "\nDISTRIBUTE BY region SORT BY f1 ASC;", SQLUtils.formatOdps(sql));
+    }
 
 }

src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest.java

@@ -1,14 +0,0 @@
-package com.alibaba.druid.bvt.sql.odps.udf;
-
-import com.alibaba.druid.support.opds.udf.ExportColumns;
-
-import junit.framework.TestCase;
-
-public class ExportColumnsTest extends TestCase {
-
-    private ExportColumns udf = new ExportColumns();
-    
-    public ExportColumnsTest() {
-        
-    }
-}