持续调整单测

alibaba · Apr 24, 2024 · b6653b6 · b6653b6
1 parent 3ee5f2d
commit b6653b6
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/...st/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java b/...st/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java
@@ -53,14 +53,14 @@ public void test_for_parameterize() throws Exception {
 
         assertEquals("SELECT `ktv_resource`.`VERSION`\n" +
                 "FROM ktv_resource `ktv_resource`\n" +
-                "WHERE `ktv_resource`.`BUYER_ID` = ?\n" +
-                "\tAND `ktv_resource`.`STATUS` = ?\n" +
-                "\tAND `ktv_resource`.`START_TIME` <= ?\n" +
-                "\tAND `ktv_resource`.`END_TIME` >= ?\n" +
-                "\tAND `ktv_resource`.`seller_id` = ?\n" +
+                "WHERE (`ktv_resource`.`BUYER_ID` = ?)\n" +
+                "\tAND (`ktv_resource`.`STATUS` = ?)\n" +
+                "\tAND (`ktv_resource`.`START_TIME` <= ?)\n" +
+                "\tAND (`ktv_resource`.`END_TIME` >= ?)\n" +
+                "\tAND (`ktv_resource`.`seller_id` = ?)\n" +
                 "\tAND (`ktv_resource`.`AVAILABLE_COUNT` IS NULL\n" +
-                "\t\tOR `ktv_resource`.`AVAILABLE_COUNT` > ?\n" +
-                "\t\tOR `ktv_resource`.`AVAILABLE_COUNT` = ?)\n" +
+                "\t\tOR (`ktv_resource`.`AVAILABLE_COUNT` > ?)\n" +
+                "\t\tOR (`ktv_resource`.`AVAILABLE_COUNT` = ?))\n" +
                 "LIMIT ?, ?", psql);
 
         String rsql = SQLUtils.format(psql, JdbcConstants.MYSQL, parameters);

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java
@@ -11,7 +11,13 @@
 
 public class AdsDumpTest_0 extends MysqlTest {
     public void test_0() throws Exception {
-        String sql = "/*+dump-merge=true*/DUMP DATA SELECT amp.buyer_add_cart_info.buyer_id,amp.buyer_add_cart_info.pre_score,amp.buyer_add_cart_info.cart_price FROM amp.buyer_add_cart_info  JOIN amp.crm_user_base_info ON amp.crm_user_base_info.user_id = amp.buyer_add_cart_info.buyer_id where (((amp.buyer_add_cart_info.seller_id=1921906956)) AND ((amp.buyer_add_cart_info.auction_id=562769960283)) AND ((amp.buyer_add_cart_info.show_price>=13300))) LIMIT 144800 ";
+        String sql = "/*+dump-merge=true*/DUMP DATA SELECT amp.buyer_add_cart_info.buyer_id,amp.buyer_add_cart_info.pre_score,amp.buyer_add_cart_info.cart_price FROM amp.buyer_add_cart_info  "
+            + "JOIN amp.crm_user_base_info "
+            + "ON amp.crm_user_base_info.user_id = amp.buyer_add_cart_info.buyer_id "
+            + "where (((amp.buyer_add_cart_info.seller_id=1921906956)) "
+            + "AND ((amp.buyer_add_cart_info.auction_id=562769960283)) "
+            + "AND ((amp.buyer_add_cart_info.show_price>=13300))) "
+            + "LIMIT 144800 ";
 
         List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
         SQLDumpStatement stmt = (SQLDumpStatement) statementList.get(0);
@@ -22,9 +28,9 @@ public void test_0() throws Exception {
                 "DUMP DATA SELECT amp.buyer_add_cart_info.buyer_id, amp.buyer_add_cart_info.pre_score, amp.buyer_add_cart_info.cart_price\n" +
                 "FROM amp.buyer_add_cart_info\n" +
                 "\tJOIN amp.crm_user_base_info ON amp.crm_user_base_info.user_id = amp.buyer_add_cart_info.buyer_id\n" +
-                "WHERE amp.buyer_add_cart_info.seller_id = 1921906956\n" +
-                "\tAND amp.buyer_add_cart_info.auction_id = 562769960283\n" +
-                "\tAND amp.buyer_add_cart_info.show_price >= 13300\n" +
+                "WHERE ((amp.buyer_add_cart_info.seller_id = 1921906956)\n" +
+                "\tAND (amp.buyer_add_cart_info.auction_id = 562769960283)\n" +
+                "\tAND (amp.buyer_add_cart_info.show_price >= 13300))\n" +
                 "LIMIT 144800", stmt.toString());
     }
 

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java
@@ -18,10 +18,10 @@ public void test_0() throws Exception {
 
         assertEquals(1, statementList.size());
 
-        assertEquals("SELECT ~43, (tinyint_1bit_test % integer_test % bigint_test) NOT IN (1, 2, 'a', BINARY 'a' = 'a ')\n" +
+        assertEquals("SELECT ~43, (tinyint_1bit_test % integer_test % bigint_test) NOT IN (1, 2, 'a', (BINARY 'a' = 'a '))\n" +
                 "FROM select_base_two_one_db_multi_tb", stmt.toString());
 
-        assertEquals("SELECT ~?, (tinyint_1bit_test % integer_test % bigint_test) NOT IN (?, ?, ?, BINARY ? = ?)\n" +
+        assertEquals("SELECT ~?, (tinyint_1bit_test % integer_test % bigint_test) NOT IN (?, ?, ?, (BINARY ? = ?))\n" +
                 "FROM select_base_two_one_db_multi_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL));
     }
 

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java
@@ -22,10 +22,10 @@ public void test_0() throws Exception {
         assertEquals(1, statementList.size());
 
         assertEquals("/*TDDL:RETRY_ERROR_SQL_ON_OLD_SERVER=FALSE*/\n" +
-                "SELECT 'b' NOT BETWEEN 'a' AND 'x-3', WEIGHT_STRING('ab' AS CHAR(4)) IS NOT UNKNOWN\n" +
+                "SELECT 'b' NOT BETWEEN 'a' AND 'x-3', (WEIGHT_STRING('ab' AS CHAR(4)) IS NOT UNKNOWN)\n" +
                 "FROM select_base_two_one_db_one_tb", stmt.toString());
 
-        assertEquals("SELECT ? NOT BETWEEN ? AND ?, WEIGHT_STRING(? AS CHAR(4)) IS NOT UNKNOWN\n" +
+        assertEquals("SELECT ? NOT BETWEEN ? AND ?, (WEIGHT_STRING(? AS CHAR(4)) IS NOT UNKNOWN)\n" +
                 "FROM select_base_two_one_db_one_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL));
     }
 

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java
@@ -18,10 +18,10 @@ public void test_0() throws Exception {
 
         assertEquals(1, statementList.size());
 
-        assertEquals("SELECT decimal_test = 87 / bigint_test = bigint_test > second(timestamp_test)\n" +
+        assertEquals("SELECT ((decimal_test = 87 / bigint_test = bigint_test) > second(timestamp_test))\n" +
                 "FROM select_base_two_multi_db_one_tb", stmt.toString());
 
-        assertEquals("SELECT decimal_test = ? / bigint_test = bigint_test > second(timestamp_test)\n" +
+        assertEquals("SELECT ((decimal_test = ? / bigint_test = bigint_test) > second(timestamp_test))\n" +
                 "FROM select_base_two_multi_db_one_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL));
     }
 

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java
@@ -28,12 +28,12 @@ public void test_0() throws Exception {
         assertEquals("SELECT 1 IS NULL, ~NULLIF(1, 1)\n" +
                 "FROM corona_select_one_db_one_tb layer_0_left_tb\n" +
                 "\tRIGHT JOIN corona_select_multi_db_one_tb layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test = layer_0_right_tb.decimal_test\n" +
-                "WHERE (1 + '1' IS NULL) != 30 - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, 0, layer_0_left_tb.year_test))", stmt.toString());
+                "WHERE 1 + '1' IS NULL != 30 - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, 0, layer_0_left_tb.year_test))", stmt.toString());
 
         assertEquals("SELECT ? IS NULL, ~NULLIF(?, ?)\n" +
                         "FROM corona_select_one_db_one_tb layer_0_left_tb\n" +
                         "\tRIGHT JOIN corona_select_multi_db_one_tb layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test = layer_0_right_tb.decimal_test\n" +
-                        "WHERE (? + ? IS NULL) != ? - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, ?, layer_0_left_tb.year_test))"
+                        "WHERE ? + ? IS NULL != ? - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, ?, layer_0_left_tb.year_test))"
                 , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql));
 
 

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java
@@ -20,12 +20,12 @@ public void test_0() throws Exception {
 
         assertEquals(1, statementList.size());
 
-        assertEquals("SELECT SQL_NO_CACHE layer_0_right_tb.integer_test IS true\n" +
+        assertEquals("SELECT SQL_NO_CACHE (layer_0_right_tb.integer_test IS true)\n" +
                 "FROM corona_select_multi_db_multi_tb layer_0_left_tb\n" +
                 "\tLEFT JOIN corona_select_one_db_one_tb layer_0_right_tb ON layer_0_right_tb.decimal_test = layer_0_left_tb.varchar_test\n" +
                 "WHERE '18015376320243458' = 18015376320243458 NOT BETWEEN layer_0_right_tb.tinyint_1bit_test AND 'x-3'", stmt.toString());
 
-        assertEquals("SELECT SQL_NO_CACHE layer_0_right_tb.integer_test IS ?\n" +
+        assertEquals("SELECT SQL_NO_CACHE (layer_0_right_tb.integer_test IS ?)\n" +
                         "FROM corona_select_multi_db_multi_tb layer_0_left_tb\n" +
                         "\tLEFT JOIN corona_select_one_db_one_tb layer_0_right_tb ON layer_0_right_tb.decimal_test = layer_0_left_tb.varchar_test\n" +
                         "WHERE ? = ? NOT BETWEEN layer_0_right_tb.tinyint_1bit_test AND ?"