Merge remote-tracking branch 'upstream/master'

abcdabcd3899 · abcdabcd3899 · commit ba7d85678e80 · 2021-03-25T10:18:19.000+08:00
diff --git a/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPHavingOracle.java b/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPHavingOracle.java
@@ -62,6 +62,7 @@ public void check() throws SQLException {
                 ClickHouseUnaryPostfixOperation.ClickHouseUnaryPostfixOperator.IS_NULL, false));
         String thirdQueryString = ClickHouseVisitor.asString(select);
         String combinedString = firstQueryString + " UNION ALL " + secondQueryString + " UNION ALL " + thirdQueryString;
+        combinedString += " SETTINGS aggregate_functions_null_for_empty=1, enable_optimize_predicate_expression=0"; // https://github.com/ClickHouse/ClickHouse/issues/12264
         List<String> secondResultSet = ComparatorHelper.getResultSetFirstColumnAsString(combinedString, errors, state);
         if (state.getOptions().logEachSelect()) {
             state.getLogger().writeCurrent(originalQueryString);
diff --git a/test/sqlancer/dbms/TestClickHouse.java b/test/sqlancer/dbms/TestClickHouse.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import org.junit.jupiter.api.Test;
+
 import sqlancer.Main;
 
 public class TestClickHouse {
@@ -33,10 +34,9 @@ public void testClickHouseTLPHaving() {
         String clickHouseAvailable = System.getenv("CLICKHOUSE_AVAILABLE");
         boolean clickHouseIsAvailable = clickHouseAvailable != null && clickHouseAvailable.equalsIgnoreCase("true");
         assumeTrue(clickHouseIsAvailable);
-        assertEquals(0, Main.executeMain("--timeout-seconds", "60", "--num-queries", "0", "--num-threads", "5",
-                "--username", "default", "--password", "", "clickhouse", "--oracle", "TLPHaving")); // Disabled
-                                                                                                    // in CI
-                                                                                                    // https://github.com/ClickHouse/ClickHouse/issues/12264
+        assertEquals(0,
+                Main.executeMain("--timeout-seconds", "60", "--num-queries", TestConfig.NUM_QUERIES, "--num-threads",
+                        "5", "--username", "default", "--password", "", "clickhouse", "--oracle", "TLPHaving"));
     }
 
     @Test
