Skip to content

Commit

Permalink
继续调整单测
Browse files Browse the repository at this point in the history 
继续调整单测
  • Loading branch information
@lizongbo
lizongbo committed Apr 24, 2024
1 parent 4f3591d commit 3ee5f2d
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 27 deletions.
3 changes: 3 additions & 0 deletions core/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5748,6 +5748,9 @@ public SQLCheck parseCheck() {
SQLCheck check = createCheck();
accept(Token.LPAREN);
check.setExpr(this.expr());
if (check.getExpr() instanceof SQLBinaryOpExpr) {
((SQLBinaryOpExpr) check.getExpr()).setParenthesized(true);
}
accept(Token.RPAREN);
return check;
}
Expand Down
10 changes: 5 additions & 5 deletions core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,31 +171,31 @@ public void test_create2() {
SQLCheck sqlCheck = (SQLCheck) element;
Assert.assertEquals(false, sqlCheck.getEnforced());
Assert.assertEquals("`c12_positive`", sqlCheck.getName().getSimpleName());
Assert.assertEquals("`c2` > 0", sqlCheck.getExpr().toString());
Assert.assertEquals("(`c2` > 0)", sqlCheck.getExpr().toString());
}
{
SQLTableElement element = statement.getTableElementList().get(4);
Assert.assertTrue(element instanceof SQLCheck);
SQLCheck sqlCheck = (SQLCheck) element;
Assert.assertNull(sqlCheck.getEnforced());
Assert.assertEquals("`c21_nonzero`", sqlCheck.getName().getSimpleName());
Assert.assertEquals("`c1` <> 0", sqlCheck.getExpr().toString());
Assert.assertEquals("(`c1` <> 0)", sqlCheck.getExpr().toString());
}
{
SQLTableElement element = statement.getTableElementList().get(5);
Assert.assertTrue(element instanceof SQLCheck);
SQLCheck sqlCheck = (SQLCheck) element;
Assert.assertNull(sqlCheck.getEnforced());
Assert.assertEquals("`t12_chk_1`", sqlCheck.getName().getSimpleName());
Assert.assertEquals("`c1` <> `c2`", sqlCheck.getExpr().toString());
Assert.assertEquals("(`c1` <> `c2`)", sqlCheck.getExpr().toString());
}
{
SQLTableElement element = statement.getTableElementList().get(6);
Assert.assertTrue(element instanceof SQLCheck);
SQLCheck sqlCheck = (SQLCheck) element;
Assert.assertNull(sqlCheck.getEnforced());
Assert.assertEquals("`t12_chk_2`", sqlCheck.getName().getSimpleName());
Assert.assertEquals("`c1` > 10", sqlCheck.getExpr().toString());
Assert.assertEquals("(`c1` > 10)", sqlCheck.getExpr().toString());
}
{
SQLTableElement element = statement.getTableElementList().get(7);
Expand All @@ -214,7 +214,7 @@ public void test_create2() {
SQLCheck sqlCheck = (SQLCheck) element;
Assert.assertNull(sqlCheck.getEnforced());
Assert.assertEquals("`t12_chk_4`", sqlCheck.getName().getSimpleName());
Assert.assertEquals("`c1` > `c3`", sqlCheck.getExpr().toString());
Assert.assertEquals("(`c1` > `c3`)", sqlCheck.getExpr().toString());
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ public void test_insert_0() throws Exception {
"\t\t\t\tON t2_1.wave_id = t2_2.id\n" +
"\t\t\t\t\tAND t2_1.warehouse_id = t2_2.warehouse_id\n" +
"\t\t\t\t\tAND t2_2.wave_status IN (5, 6)\n" +
"\t\t\t\t\tAND t2_1.ds >= 201901 - 1\n" +
"\t\t\t\t\tAND t2_2.ds >= 201901 - 1\n" +
"\t\t\t\t\tAND t2_1.ds >= (201901 - 1)\n" +
"\t\t\t\t\tAND t2_2.ds >= (201901 - 1)\n" +
"\t\t\t\t\tAND t2_1.gmt_create >= date_add(now(), INTERVAL -3 DAY)\n" +
"\t\t\t\t\tAND t2_1.gmt_create <= now()\n" +
"\t\t\t\t\tAND t2_2.gmt_create >= date_add(now(), INTERVAL -3 DAY)\n" +
Expand Down
40 changes: 20 additions & 20 deletions ...st/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_30.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ public void test_for_parameterize() throws Exception {
"\t, `udata`.`status` AS `status`, `udata`.`charging_period` AS `chargingPeriod`, `udata`.`sn` AS `sn`, `udata`.`cpd` AS `chargingPeriodDesc`, `udata`.`task_total_num` AS `taskTotalNum`\n" +
"\t, `udata`.`tcn` AS `taCoNu`, `udata`.`task_type` AS `taskType`, `udata`.`ilbu` AS `isLaBiUs`\n" +
"FROM udata `udata`\n" +
"WHERE `udata`.`id` IN (\n" +
"WHERE (`udata`.`id` IN (\n" +
"\t\tSELECT MAX(`udata`.`id`)\n" +
"\t\tFROM udata `udata`\n" +
"\t\tWHERE `udata`.`uid` = ?\n" +
"\t\t\tAND `udata`.`user_type` = ?\n" +
"\t\t\tAND `udata`.`start_period_time` <= ?\n" +
"\t\t\tAND `udata`.`status` = ?\n" +
"\t\t\tAND `udata`.`charging_period` = ?\n" +
"\t\t\tAND `udata`.`task_type` = ?\n" +
"\t\t\tAND `udata`.`task_total_num` <= `udata`.`tcn`\n" +
"\t\tWHERE (`udata`.`uid` = ?)\n" +
"\t\t\tAND (`udata`.`user_type` = ?)\n" +
"\t\t\tAND (`udata`.`start_period_time` <= ?)\n" +
"\t\t\tAND (`udata`.`status` = ?)\n" +
"\t\t\tAND (`udata`.`charging_period` = ?)\n" +
"\t\t\tAND (`udata`.`task_type` = ?)\n" +
"\t\t\tAND (`udata`.`task_total_num` <= `udata`.`tcn`)\n" +
"\t\tGROUP BY `udata`.`charging_period`, `udata`.`start_period_time`, `udata`.`ept`\n" +
"\t)\n" +
"\tAND (`udata`.`uid` = ?\n" +
"\t\tAND `udata`.`user_type` = ?)\n" +
"\tAND ((`udata`.`uid` = ?)\n" +
"\t\tAND (`udata`.`user_type` = ?)))\n" +
"ORDER BY `udata`.`start_period_time` DESC\n" +
"LIMIT ?, ?", psql);

Expand Down Expand Up @@ -82,20 +82,20 @@ public void test_for_parameterize() throws Exception {
"\t, `udata`.`status` AS `status`, `udata`.`charging_period` AS `chargingPeriod`, `udata`.`sn` AS `sn`, `udata`.`cpd` AS `chargingPeriodDesc`, `udata`.`task_total_num` AS `taskTotalNum`\n" +
"\t, `udata`.`tcn` AS `taCoNu`, `udata`.`task_type` AS `taskType`, `udata`.`ilbu` AS `isLaBiUs`\n" +
"FROM udata_0888 `udata`\n" +
"WHERE `udata`.`id` IN (\n" +
"WHERE (`udata`.`id` IN (\n" +
"\t\tSELECT MAX(`udata`.`id`)\n" +
"\t\tFROM udata_0888 `udata`\n" +
"\t\tWHERE `udata`.`uid` = 1039100792\n" +
"\t\t\tAND `udata`.`user_type` = 2\n" +
"\t\t\tAND `udata`.`start_period_time` <= '2017-01-01 00:00:00'\n" +
"\t\t\tAND `udata`.`status` = 10\n" +
"\t\t\tAND `udata`.`charging_period` = 1\n" +
"\t\t\tAND `udata`.`task_type` = 1\n" +
"\t\t\tAND `udata`.`task_total_num` <= `udata`.`tcn`\n" +
"\t\tWHERE (`udata`.`uid` = 1039100792)\n" +
"\t\t\tAND (`udata`.`user_type` = 2)\n" +
"\t\t\tAND (`udata`.`start_period_time` <= '2017-01-01 00:00:00')\n" +
"\t\t\tAND (`udata`.`status` = 10)\n" +
"\t\t\tAND (`udata`.`charging_period` = 1)\n" +
"\t\t\tAND (`udata`.`task_type` = 1)\n" +
"\t\t\tAND (`udata`.`task_total_num` <= `udata`.`tcn`)\n" +
"\t\tGROUP BY `udata`.`charging_period`, `udata`.`start_period_time`, `udata`.`ept`\n" +
"\t)\n" +
"\tAND (`udata`.`uid` = '1039100792'\n" +
"\t\tAND `udata`.`user_type` = 2)\n" +
"\tAND ((`udata`.`uid` = '1039100792')\n" +
"\t\tAND (`udata`.`user_type` = 2)))\n" +
"ORDER BY `udata`.`start_period_time` DESC\n" +
"LIMIT 0, 6", buf.toString());
}
Expand Down

0 comments on commit 3ee5f2d

Please sign in to comment.