[SQLite] Reliably exclude rowid columns in the PQS implementation

mrigger · mrigger · commit 4ba8cd757593 · 2020-08-23T00:17:32.000+02:00
diff --git a/src/sqlancer/sqlite3/oracle/SQLite3PivotedQuerySynthesisOracle.java b/src/sqlancer/sqlite3/oracle/SQLite3PivotedQuerySynthesisOracle.java
@@ -36,6 +36,7 @@
 import sqlancer.sqlite3.ast.SQLite3WindowFunction;
 import sqlancer.sqlite3.gen.SQLite3Common;
 import sqlancer.sqlite3.gen.SQLite3ExpressionGenerator;
+import sqlancer.sqlite3.schema.SQLite3Schema;
 import sqlancer.sqlite3.schema.SQLite3Schema.SQLite3Column;
 import sqlancer.sqlite3.schema.SQLite3Schema.SQLite3RowValue;
 import sqlancer.sqlite3.schema.SQLite3Schema.SQLite3Table;
@@ -87,8 +88,8 @@ public SQLite3Select getQuery(SQLite3GlobalState globalState) throws SQLExceptio
         // TODO: also implement a wild-card check (*)
         // filter out row ids from the select because the hinder the reduction process
         // once a bug is found
-        List<SQLite3Column> columnsWithoutRowid = columns.stream().filter(c -> !c.getName().matches("rowid"))
-                .collect(Collectors.toList());
+        List<SQLite3Column> columnsWithoutRowid = columns.stream()
+                .filter(c -> !SQLite3Schema.ROWID_STRINGS.contains(c.getName())).collect(Collectors.toList());
         fetchColumns = Randomly.nonEmptySubset(columnsWithoutRowid);
         colExpressions = new ArrayList<>();
         List<SQLite3Table> allTables = new ArrayList<>();
diff --git a/src/sqlancer/sqlite3/schema/SQLite3Schema.java b/src/sqlancer/sqlite3/schema/SQLite3Schema.java
@@ -31,6 +31,11 @@
 
 public class SQLite3Schema {
 
+    /**
+     * All possible aliases for the rowid column.
+     */
+    public static final List<String> ROWID_STRINGS = Collections
+            .unmodifiableList(Arrays.asList("rowid", "_rowid_", "oid"));
     private final List<SQLite3Table> databaseTables;
     private final List<String> indexNames;
 
@@ -336,7 +341,7 @@ public static SQLite3Schema fromConnection(SQLite3GlobalState globalState) throw
                             tableType.contentEquals("temp_table") ? TableKind.TEMP : TableKind.MAIN, withoutRowid,
                             nrRows, isView, isVirtual, isReadOnly);
                     if (isRowIdTable(withoutRowid, isView, isVirtual)) {
-                        String rowId = Randomly.fromOptions("rowid", "_rowid_", "oid");
+                        String rowId = Randomly.fromList(ROWID_STRINGS);
                         SQLite3Column rowid = new SQLite3Column(rowId, SQLite3DataType.INT, true, null, true);
                         t.addRowid(rowid);
                         rowid.setTable(t);
