Add a method to allow the oracle factory to indicate that each table must contains at least one row

mrigger · mrigger · commit d0b4218f9410 · 2020-08-23T14:13:45.000+02:00
diff --git a/src/sqlancer/OracleFactory.java b/src/sqlancer/OracleFactory.java
@@ -8,4 +8,13 @@ public interface OracleFactory<G extends GlobalState<?, ?>> {
 
     TestOracle create(G globalState) throws SQLException;
 
+    /**
+     * Indicates whether the test oracle requires that all tables (including views) contain at least one row.
+     *
+     * @return whether the test oracle requires at least one row per table
+     */
+    default boolean requiresAllTablesToContainRows() {
+        return false;
+    }
+
 }
diff --git a/src/sqlancer/common/oracle/TestOracle.java b/src/sqlancer/common/oracle/TestOracle.java
@@ -6,8 +6,4 @@ public interface TestOracle {
 
     void check() throws SQLException;
 
-    default boolean onlyWorksForNonEmptyTables() {
-        return false;
-    }
-
 }
diff --git a/src/sqlancer/mysql/MySQLOptions.java b/src/sqlancer/mysql/MySQLOptions.java
@@ -11,6 +11,7 @@
 import sqlancer.OracleFactory;
 import sqlancer.common.oracle.TestOracle;
 import sqlancer.mysql.MySQLOptions.MySQLOracleFactory;
+import sqlancer.mysql.oracle.MySQLPivotedQuerySynthesisOracle;
 import sqlancer.mysql.oracle.MySQLTLPWhereOracle;
 
 @Parameters
@@ -28,6 +29,19 @@ public TestOracle create(MySQLGlobalState globalState) throws SQLException {
                 return new MySQLTLPWhereOracle(globalState);
             }
 
+        },
+        PQS {
+
+            @Override
+            public TestOracle create(MySQLGlobalState globalState) throws SQLException {
+                return new MySQLPivotedQuerySynthesisOracle(globalState);
+            }
+
+            @Override
+            public boolean requiresAllTablesToContainRows() {
+                return true;
+            }
+
         }
     }
 
diff --git a/src/sqlancer/postgres/PostgresOptions.java b/src/sqlancer/postgres/PostgresOptions.java
@@ -46,6 +46,11 @@ public TestOracle create(PostgresGlobalState globalState) throws SQLException {
             public TestOracle create(PostgresGlobalState globalState) throws SQLException {
                 return new PostgresPivotedQuerySynthesisOracle(globalState);
             }
+
+            @Override
+            public boolean requiresAllTablesToContainRows() {
+                return true;
+            }
         },
         HAVING {
 
diff --git a/src/sqlancer/sqlite3/SQLite3Options.java b/src/sqlancer/sqlite3/SQLite3Options.java
@@ -94,6 +94,12 @@ public enum SQLite3OracleFactory implements OracleFactory<SQLite3GlobalState> {
             public TestOracle create(SQLite3GlobalState globalState) throws SQLException {
                 return new SQLite3PivotedQuerySynthesisOracle(globalState);
             }
+
+            @Override
+            public boolean requiresAllTablesToContainRows() {
+                return true;
+            }
+
         },
         NoREC {
             @Override

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,4 @@ public interface TestOracle {`
`6`	`6`
`7`	`7`	`void check() throws SQLException;`
`8`	`8`
`9`		`- default boolean onlyWorksForNonEmptyTables() {`
`10`		`- return false;`
`11`		`- }`
`12`		`-`
`13`	`9`	`}`