Simplify the schema update logic

sqlancer · Sep 23, 2020 · d0d0d60 · d0d0d60
1 parent f5d1d44
commit d0d0d60
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/src/sqlancer/GlobalState.java b/src/sqlancer/GlobalState.java
@@ -164,6 +164,10 @@ protected void setSchema(S schema) {
         this.schema = schema;
     }
 
-    protected abstract void updateSchema() throws SQLException;
+    public void updateSchema() throws SQLException {
+        setSchema(readSchema());
+    }
+
+    protected abstract S readSchema() throws SQLException;
 
 }
diff --git a/src/sqlancer/citus/CitusGlobalState.java b/src/sqlancer/citus/CitusGlobalState.java
@@ -17,8 +17,8 @@ public boolean getRepartition() {
     }
 
     @Override
-    public void updateSchema() throws SQLException {
-        setSchema(CitusSchema.fromConnection(getConnection(), getDatabaseName()));
+    public CitusSchema readSchema() throws SQLException {
+        return CitusSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
 }
diff --git a/src/sqlancer/clickhouse/ClickHouseProvider.java b/src/sqlancer/clickhouse/ClickHouseProvider.java
@@ -74,8 +74,8 @@ public String getDatabaseName() {
         }
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(ClickHouseSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected ClickHouseSchema readSchema() throws SQLException {
+            return ClickHouseSchema.fromConnection(getConnection(), getDatabaseName());
         }
     }
 

diff --git a/src/sqlancer/cockroachdb/CockroachDBProvider.java b/src/sqlancer/cockroachdb/CockroachDBProvider.java
@@ -113,8 +113,8 @@ public Query getQuery(CockroachDBGlobalState state) throws SQLException {
     public static class CockroachDBGlobalState extends GlobalState<CockroachDBOptions, CockroachDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(CockroachDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected CockroachDBSchema readSchema() throws SQLException {
+            return CockroachDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }

diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -88,8 +88,8 @@ private static int mapActions(DuckDBGlobalState globalState, Action a) {
     public static class DuckDBGlobalState extends GlobalState<DuckDBOptions, DuckDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(DuckDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected DuckDBSchema readSchema() throws SQLException {
+            return DuckDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }

diff --git a/src/sqlancer/mariadb/MariaDBProvider.java b/src/sqlancer/mariadb/MariaDBProvider.java
@@ -155,8 +155,8 @@ public void generateDatabase(MariaDBGlobalState globalState) throws SQLException
     public static class MariaDBGlobalState extends GlobalState<MariaDBOptions, MariaDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(MariaDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected MariaDBSchema readSchema() throws SQLException {
+            return MariaDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }

diff --git a/src/sqlancer/mysql/MySQLGlobalState.java b/src/sqlancer/mysql/MySQLGlobalState.java
@@ -9,8 +9,8 @@
 public class MySQLGlobalState extends GlobalState<MySQLOptions, MySQLSchema> {
 
     @Override
-    protected void updateSchema() throws SQLException {
-        setSchema(MySQLSchema.fromConnection(getConnection(), getDatabaseName()));
+    protected MySQLSchema readSchema() throws SQLException {
+        return MySQLSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
     public boolean usesPQS() {

diff --git a/src/sqlancer/postgres/PostgresGlobalState.java b/src/sqlancer/postgres/PostgresGlobalState.java
@@ -101,8 +101,8 @@ public String getRandomOpclass() {
     }
 
     @Override
-    public void updateSchema() throws SQLException {
-        setSchema(PostgresSchema.fromConnection(getConnection(), getDatabaseName()));
+    public PostgresSchema readSchema() throws SQLException {
+        return PostgresSchema.fromConnection(getConnection(), getDatabaseName());
     }
 
     public void addFunctionAndType(String functionName, Character functionType) {

diff --git a/src/sqlancer/sqlite3/SQLite3Provider.java b/src/sqlancer/sqlite3/SQLite3Provider.java
@@ -115,8 +115,8 @@ public Query getQuery(SQLite3GlobalState state) throws SQLException {
     public static class SQLite3GlobalState extends GlobalState<SQLite3Options, SQLite3Schema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(SQLite3Schema.fromConnection(this));
+        protected SQLite3Schema readSchema() throws SQLException {
+            return SQLite3Schema.fromConnection(this);
         }
 
     }

diff --git a/src/sqlancer/tidb/TiDBProvider.java b/src/sqlancer/tidb/TiDBProvider.java
@@ -69,8 +69,8 @@ public Query getQuery(TiDBGlobalState state) throws SQLException {
     public static class TiDBGlobalState extends GlobalState<TiDBOptions, TiDBSchema> {
 
         @Override
-        protected void updateSchema() throws SQLException {
-            setSchema(TiDBSchema.fromConnection(getConnection(), getDatabaseName()));
+        protected TiDBSchema readSchema() throws SQLException {
+            return TiDBSchema.fromConnection(getConnection(), getDatabaseName());
         }
 
     }