[SQLite] Add a method to the expression generator that returns an expression with known result

mrigger · mrigger · commit e5e04905fe89 · 2020-08-22T23:55:52.000+02:00
diff --git a/src/sqlancer/sqlite3/gen/SQLite3ExpressionGenerator.java b/src/sqlancer/sqlite3/gen/SQLite3ExpressionGenerator.java
@@ -654,4 +654,12 @@ public SQLite3Expression isNull(SQLite3Expression expr) {
         return new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.ISNULL, expr);
     }
 
+    public SQLite3Expression generateResultKnownExpression() {
+        SQLite3Expression expr;
+        do {
+            expr = generateExpression();
+        } while (expr.getExpectedValue() == null);
+        return expr;
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/oracle/SQLite3PivotedQuerySynthesisOracle.java b/src/sqlancer/sqlite3/oracle/SQLite3PivotedQuerySynthesisOracle.java
@@ -110,11 +110,8 @@ public SQLite3Select getQuery(SQLite3GlobalState globalState) throws SQLExceptio
                 errors.add("second argument to nth_value must be a positive integer");
             }
             if (Randomly.getBoolean()) {
-                SQLite3Expression randomExpression;
-                do {
-                    randomExpression = new SQLite3ExpressionGenerator(globalState).setColumns(columns)
-                            .generateExpression();
-                } while (randomExpression.getExpectedValue() == null);
+                SQLite3Expression randomExpression = new SQLite3ExpressionGenerator(globalState).setColumns(columns)
+                        .generateResultKnownExpression();
                 colExpressions.add(randomExpression);
             } else {
                 colExpressions.add(colName);
@@ -259,16 +256,14 @@ private SQLite3Expression generateWhereClauseThatContainsRowValue(List<SQLite3Co
     private SQLite3Expression generateNewExpression(List<SQLite3Column> columns, SQLite3RowValue rw) {
         do {
             SQLite3Expression expr = new SQLite3ExpressionGenerator(globalState).setRowValue(rw).setColumns(columns)
-                    .generateExpression();
-            if (expr.getExpectedValue() != null) {
-                if (expr.getExpectedValue().isNull()) {
-                    return new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.ISNULL, expr);
-                }
-                if (SQLite3Cast.isTrue(expr.getExpectedValue()).get()) {
-                    return expr;
-                } else {
-                    return new SQLite3UnaryOperation(UnaryOperator.NOT, expr);
-                }
+                    .generateResultKnownExpression();
+            if (expr.getExpectedValue().isNull()) {
+                return new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.ISNULL, expr);
+            }
+            if (SQLite3Cast.isTrue(expr.getExpectedValue()).get()) {
+                return expr;
+            } else {
+                return new SQLite3UnaryOperation(UnaryOperator.NOT, expr);
             }
         } while (true);
     }

Original file line number	Diff line number	Diff line change
`@@ -654,4 +654,12 @@ public SQLite3Expression isNull(SQLite3Expression expr) {`
`654`	`654`	`return new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.ISNULL, expr);`
`655`	`655`	`}`
`656`	`656`
	`657`	`+ public SQLite3Expression generateResultKnownExpression() {`
	`658`	`+ SQLite3Expression expr;`
	`659`	`+ do {`
	`660`	`+ expr = generateExpression();`
	`661`	`+ } while (expr.getExpectedValue() == null);`
	`662`	`+ return expr;`
	`663`	`+ }`
	`664`	`+`
`657`	`665`	`}`