Merge pull request #1091 from wenshao/master

change sql parser exists format

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 1999-2101 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.mysql;
+
+import org.junit.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class MySqlFormatTest2 extends TestCase {
+
+    public void test_0() throws Exception {
+        String text = "SELECT cq.uuid FROM ce_queue cq "
+                + "WHERE cq.status = ? AND NOT EXISTS (SELECT ? FROM ce_queue cq2 WHERE cq.component_uuid = cq2.component_uuid AND cq2.status <> ?) "
+                + "ORDER BY cq.created_at ASC, cq.id ASC";
+        Assert.assertEquals("SELECT cq.uuid"
+                + "\nFROM ce_queue cq"
+                + "\nWHERE cq.status = ?"
+                + "\n\tAND NOT EXISTS ("
+                + "\n\t\tSELECT ?"
+                + "\n\t\tFROM ce_queue cq2"
+                + "\n\t\tWHERE cq.component_uuid = cq2.component_uuid"
+                + "\n\t\t\tAND cq2.status <> ?"
+                + "\n\t\t)"
+                + "\nORDER BY cq.created_at ASC, cq.id ASC", SQLUtils.format(text, JdbcUtils.MYSQL));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java

@@ -113,7 +113,12 @@ public class SELECT_Syntax_Test extends TestCase {
 
         String text = output(stmtList);
 
-        Assert.assertEquals("SELECT column1\nFROM t1\nWHERE EXISTS (SELECT *\n\tFROM t2);", text);
+        Assert.assertEquals("SELECT column1" //
+                + "\nFROM t1" //
+                + "\nWHERE EXISTS (" //
+                + "\n\tSELECT *" //
+                + "\n\tFROM t2"
+                + "\n\t);", text);
     }
 
     public void test_8() throws Exception {
@@ -124,7 +129,13 @@ public class SELECT_Syntax_Test extends TestCase {
 
         String text = output(stmtList);
 
-        Assert.assertEquals("SELECT DISTINCT store_type\nFROM stores\nWHERE NOT EXISTS (SELECT *\n\tFROM cities_stores\n\tWHERE cities_stores.store_type = stores.store_type);",
+        Assert.assertEquals("SELECT DISTINCT store_type" //
+                + "\nFROM stores" //
+                + "\nWHERE NOT EXISTS (" //
+                + "\n\tSELECT *"
+                + "\n\tFROM cities_stores"
+                + "\n\tWHERE cities_stores.store_type = stores.store_type"
+                + "\n\t);",
                             text);
     }
 

src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest7.java

@@ -79,7 +79,8 @@ public class SQLServerSelectTest7 extends TestCase {
 				"\nWHERE 1 = 1" +
 				"\n\tAND t.deleted = 0" +
 				"\n\tAND t.link_type IN ('simple', 'link')" +
-				"\n\tAND (EXISTS (SELECT p.entity_code" +
+				"\n\tAND (EXISTS (" + 
+				"\n\t\t\tSELECT p.entity_code" +
 				"\n\t\t\tFROM sec_role_auth p" +
 				"\n\t\t\tWHERE p.entity_code = t.menu_id" +
 				"\n\t\t\t\tAND p.entity_type = 'menu'" +
@@ -89,7 +90,8 @@ public class SQLServerSelectTest7 extends TestCase {
 				"\n\t\t\t\t\t\tAND entity_code = ?" +
 				"\n\t\t\t\t\t\tAND r.role_id = rm.role_id" +
 				"\n\t\t\t\t\t\tAND r.enabled = 1" +
-				"\n\t\t\t\t\t\tAND r.deleted = 0))" +
+				"\n\t\t\t\t\t\tAND r.deleted = 0)"+ 
+				"\n\t\t\t)" +
 				"\n\t\tOR '1' = ?" +
 				"\n\t\tOR t.need_control = 0)" +
 				"\n\tAND (t.enabled = 1" +