Introduce a generatePredicate() method in the ExpressionGenerator class

mrigger · mrigger · commit 2082fb96e8ce · 2020-07-14T23:25:23.000+02:00
diff --git a/src/sqlancer/clickhouse/gen/ClickHouseExpressionGenerator.java b/src/sqlancer/clickhouse/gen/ClickHouseExpressionGenerator.java
@@ -165,4 +165,9 @@ private ClickHouseExpression getAggregate(ClickHouseDataType dataType) {
         ClickHouseAggregate.ClickHouseAggregateFunction agg = Randomly.fromList(aggregates);
         return generateArgsForAggregate(dataType, agg);
     }
+
+    @Override
+    public ClickHouseExpression generatePredicate() {
+        return generateExpression(new ClickHouseSchema.ClickHouseLancerDataType(ClickHouseDataType.UInt8));
+    }
 }
diff --git a/src/sqlancer/cockroachdb/gen/CockroachDBExpressionGenerator.java b/src/sqlancer/cockroachdb/gen/CockroachDBExpressionGenerator.java
@@ -343,4 +343,9 @@ protected CockroachDBExpression generateColumn(CockroachDBCompositeDataType type
         return columnReference;
     }
 
+    @Override
+    public CockroachDBExpression generatePredicate() {
+        return generateExpression(CockroachDBDataType.BOOL.get());
+    }
+
 }
diff --git a/src/sqlancer/gen/ExpressionGenerator.java b/src/sqlancer/gen/ExpressionGenerator.java
@@ -2,4 +2,11 @@
 
 public interface ExpressionGenerator<E> {
 
+    /**
+     * Generates a boolean predicate.
+     *
+     * @return an expression that can be used in a boolean context.
+     */
+    E generatePredicate();
+
 }
diff --git a/src/sqlancer/gen/UntypedExpressionGenerator.java b/src/sqlancer/gen/UntypedExpressionGenerator.java
@@ -63,4 +63,9 @@ public E generateHavingClause() {
         return expr;
     }
 
+    @Override
+    public E generatePredicate() {
+        return generateExpression();
+    }
+
 }
diff --git a/src/sqlancer/postgres/gen/PostgresExpressionGenerator.java b/src/sqlancer/postgres/gen/PostgresExpressionGenerator.java
@@ -575,4 +575,9 @@ public PostgresExpressionGenerator allowAggregates(boolean value) {
         return this;
     }
 
+    @Override
+    public PostgresExpression generatePredicate() {
+        return generateExpression(0);
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/gen/SQLite3ExpressionGenerator.java b/src/sqlancer/sqlite3/gen/SQLite3ExpressionGenerator.java
@@ -641,4 +641,9 @@ public SQLite3Expression getHavingClause() {
         return generateExpression();
     }
 
+    @Override
+    public SQLite3Expression generatePredicate() {
+        return generateExpression();
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -165,4 +165,9 @@ private ClickHouseExpression getAggregate(ClickHouseDataType dataType) {`
`165`	`165`	`ClickHouseAggregate.ClickHouseAggregateFunction agg = Randomly.fromList(aggregates);`
`166`	`166`	`return generateArgsForAggregate(dataType, agg);`
`167`	`167`	`}`
	`168`	`+`
	`169`	`+ @Override`
	`170`	`+ public ClickHouseExpression generatePredicate() {`
	`171`	`+ return generateExpression(new ClickHouseSchema.ClickHouseLancerDataType(ClickHouseDataType.UInt8));`
	`172`	`+ }`
`168`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,4 +343,9 @@ protected CockroachDBExpression generateColumn(CockroachDBCompositeDataType type`
`343`	`343`	`return columnReference;`
`344`	`344`	`}`
`345`	`345`
	`346`	`+ @Override`
	`347`	`+ public CockroachDBExpression generatePredicate() {`
	`348`	`+ return generateExpression(CockroachDBDataType.BOOL.get());`
	`349`	`+ }`
	`350`	`+`
`346`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,9 @@ public E generateHavingClause() {`
`63`	`63`	`return expr;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ @Override`
	`67`	`+ public E generatePredicate() {`
	`68`	`+ return generateExpression();`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,4 +575,9 @@ public PostgresExpressionGenerator allowAggregates(boolean value) {`
`575`	`575`	`return this;`
`576`	`576`	`}`
`577`	`577`
	`578`	`+ @Override`
	`579`	`+ public PostgresExpression generatePredicate() {`
	`580`	`+ return generateExpression(0);`
	`581`	`+ }`
	`582`	`+`
`578`	`583`	`}`
Original file line number	Diff line number	Diff line change
`@@ -641,4 +641,9 @@ public SQLite3Expression getHavingClause() {`
`641`	`641`	`return generateExpression();`
`642`	`642`	`}`
`643`	`643`
	`644`	`+ @Override`
	`645`	`+ public SQLite3Expression generatePredicate() {`
	`646`	`+ return generateExpression();`
	`647`	`+ }`
	`648`	`+`
`644`	`649`	`}`