[CockroachDB] Update tests

malwaregarry · malwaregarry · commit d18ce4c0d9e8 · 2024-09-02T17:42:27.000+08:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -144,7 +144,9 @@ jobs:
       - name: Create SQLancer user
         run: cd cockroach-v24.1.0-rc.2.linux-amd64/ && ./cockroach sql --insecure -e "CREATE USER sqlancer; GRANT admin to sqlancer" && cd ..
       - name: Run Tests
-        run: COCKROACHDB_AVAILABLE=true mvn -Dtest=TestCockroachDB test
+        run: |
+          COCKROACHDB_AVAILABLE=true mvn -Dtest=TestCockroachDBNoREC test
+          COCKROACHDB_AVAILABLE=true mvn -Dtest=TestCockroachDBTLP test
 
   cockroachdb-qpg:
     name: QPG Tests (CockroachDB)
diff --git a/src/sqlancer/cockroachdb/CockroachDBErrors.java b/src/sqlancer/cockroachdb/CockroachDBErrors.java
@@ -206,6 +206,8 @@ public static List<String> getExpressionErrors() {
         errors.add("argument of OFFSET must be type int, not type decimal");
         errors.add("ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list");
 
+        errors.add("incompatible IF expressions");
+
         errors.addAll(getArrayErrors());
         errors.addAll(getComputedColumnErrors());
 
diff --git a/test/sqlancer/dbms/TestCockroachDBNoREC.java b/test/sqlancer/dbms/TestCockroachDBNoREC.java
@@ -7,15 +7,13 @@
 
 import sqlancer.Main;
 
-public class TestCockroachDB {
+public class TestCockroachDBNoREC {
 
     @Test
-    public void testMySQL() {
-        String cockroachDB = System.getenv("COCKROACHDB_AVAILABLE");
-        boolean cockroachDBIsAvailable = cockroachDB != null && cockroachDB.equalsIgnoreCase("true");
-        assumeTrue(cockroachDBIsAvailable);
+    public void testCockroachDBNoREC() {
+        assumeTrue(TestConfig.isEnvironmentTrue(TestConfig.COCKROACHDB_ENV));
         assertEquals(0, Main.executeMain(new String[] { "--random-seed", "0", "--timeout-seconds", TestConfig.SECONDS,
-                "--num-queries", TestConfig.NUM_QUERIES, "cockroachdb" }));
+                "--num-queries", TestConfig.NUM_QUERIES, "cockroachdb", "--oracle", "NOREC" }));
     }
 
 }
diff --git a/test/sqlancer/dbms/TestCockroachDBTLP.java b/test/sqlancer/dbms/TestCockroachDBTLP.java
@@ -0,0 +1,19 @@
+package sqlancer.dbms;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.junit.jupiter.api.Test;
+
+import sqlancer.Main;
+
+public class TestCockroachDBTLP {
+
+    @Test
+    public void testCockroachDBTLP() {
+        assumeTrue(TestConfig.isEnvironmentTrue(TestConfig.COCKROACHDB_ENV));
+        assertEquals(0, Main.executeMain(new String[] { "--random-seed", "0", "--timeout-seconds", TestConfig.SECONDS,
+                "--num-queries", TestConfig.NUM_QUERIES, "cockroachdb", "--oracle", "QUERY_PARTITIONING" }));
+    }
+
+}
diff --git a/test/sqlancer/dbms/TestConfig.java b/test/sqlancer/dbms/TestConfig.java
@@ -4,6 +4,7 @@ public class TestConfig {
     public static final String NUM_QUERIES = "1000";
     public static final String SECONDS = "300";
 
+    public static final String COCKROACHDB_ENV = "COCKROACHDB_AVAILABLE";
     public static final String DATABEND_ENV = "DATABEND_AVAILABLE";
     public static final String DORIS_ENV = "DORIS_AVAILABLE";
     public static final String MARIADB_ENV = "MARIADB_AVAILABLE";
