aashvgit
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/main.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/sqlancer/cockroachdb/CockroachDBBugs.java‎
Lines changed: 4 additions & 0 deletions b/‎src/sqlancer/cockroachdb/CockroachDBBugs.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/sqlancer/cockroachdb/CockroachDBErrors.java‎
Lines changed: 9 additions & 0 deletions b/‎src/sqlancer/cockroachdb/CockroachDBErrors.java‎
Lines changed: 9 additions & 0 deletions
@@ -109,11 +109,11 @@ jobs:
         run: mvn -B package -DskipTests=true
       - name: Set up CockroachDB
         run: |
-          wget -qO- https://binaries.cockroachdb.com/cockroach-v21.1.7.linux-amd64.tgz | tar  xvz
-          cd cockroach-v21.1.7.linux-amd64/ && ./cockroach start-single-node --insecure &
+          wget -qO- https://binaries.cockroachdb.com/cockroach-v22.2.0-beta.4.linux-amd64.tgz | tar  xvz
+          cd cockroach-v22.2.0-beta.4.linux-amd64/ && ./cockroach start-single-node --insecure &
           sleep 10
       - name: Create SQLancer user
-        run: cd cockroach-v21.1.7.linux-amd64/ && ./cockroach sql --insecure -e "CREATE USER sqlancer; GRANT admin to sqlancer" && cd ..
+        run: cd cockroach-v22.2.0-beta.4.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
 
 
@@ -50,6 +50,10 @@ public final class CockroachDBBugs {
     // https://github.com/cockroachdb/cockroach/issues/85499
     public static boolean bug85499 = true;
 
+    // https://github.com/cockroachdb/cockroach/issues/88037
+    // TODO: This should be fixed in v22.2.1.
+    public static boolean bug88037 = true;
+
     private CockroachDBBugs() {
     }
 
 
@@ -186,6 +186,9 @@ public static void addExpressionErrors(ExpectedErrors errors) {
         if (CockroachDBBugs.bug85499) {
             errors.add("estimated row count must be non-zero");
         }
+        if (CockroachDBBugs.bug88037) {
+            errors.add("expected required columns to be a subset of output columns");
+        }
 
         errors.add("unable to vectorize execution plan"); // SET vectorize=experimental_always;
         errors.add(" mismatched physical types at index"); // SET vectorize=experimental_always;
@@ -203,6 +206,7 @@ public static void addExpressionErrors(ExpectedErrors errors) {
         errors.add("ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list");
 
         addArrayErrors(errors);
+        addComputedColumnErrors(errors);
     }
 
     private static void addArrayErrors(ExpectedErrors errors) {
@@ -308,4 +312,9 @@ public static void addTransactionErrors(ExpectedErrors errors) {
         errors.add("current transaction is aborted");
     }
 
+    private static void addComputedColumnErrors(ExpectedErrors errors) {
+        // computed columns
+        errors.add("computed column expressions cannot reference computed columns");
+    }
+
 }
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ public final class CockroachDBBugs {`
`50`	`50`	`// https://github.com/cockroachdb/cockroach/issues/85499`
`51`	`51`	`public static boolean bug85499 = true;`
`52`	`52`
	`53`	`+ // https://github.com/cockroachdb/cockroach/issues/88037`
	`54`	`+ // TODO: This should be fixed in v22.2.1.`
	`55`	`+ public static boolean bug88037 = true;`
	`56`	`+`
`53`	`57`	`private CockroachDBBugs() {`
`54`	`58`	`}`
`55`	`59`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,9 @@ public static void addExpressionErrors(ExpectedErrors errors) {`
`186`	`186`	`if (CockroachDBBugs.bug85499) {`
`187`	`187`	`errors.add("estimated row count must be non-zero");`
`188`	`188`	`}`
	`189`	`+ if (CockroachDBBugs.bug88037) {`
	`190`	`+ errors.add("expected required columns to be a subset of output columns");`
	`191`	`+ }`
`189`	`192`
`190`	`193`	`errors.add("unable to vectorize execution plan"); // SET vectorize=experimental_always;`
`191`	`194`	`errors.add(" mismatched physical types at index"); // SET vectorize=experimental_always;`
`@@ -203,6 +206,7 @@ public static void addExpressionErrors(ExpectedErrors errors) {`
`203`	`206`	`errors.add("ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list");`
`204`	`207`
`205`	`208`	`addArrayErrors(errors);`
	`209`	`+ addComputedColumnErrors(errors);`
`206`	`210`	`}`
`207`	`211`
`208`	`212`	`private static void addArrayErrors(ExpectedErrors errors) {`
`@@ -308,4 +312,9 @@ public static void addTransactionErrors(ExpectedErrors errors) {`
`308`	`312`	`errors.add("current transaction is aborted");`
`309`	`313`	`}`
`310`	`314`
	`315`	`+ private static void addComputedColumnErrors(ExpectedErrors errors) {`
	`316`	`+ // computed columns`
	`317`	`+ errors.add("computed column expressions cannot reference computed columns");`
	`318`	`+ }`
	`319`	`+`
`311`	`320`	`}`