Skip to content

Commit b7e4cf0

Browse files
mriggermrigger
committed
Introduce a sqlancer.common.query package
1 parent 0c736fa commit b7e4cf0

File tree

150 files changed

+382
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+382
-359
lines changed

‎src/sqlancer/AbstractAction.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.sql.SQLException;
44

5+
import sqlancer.common.query.Query;
6+
57
public interface AbstractAction<G> {
68

79
Query getQuery(G globalState) throws SQLException;

‎src/sqlancer/ComparatorHelper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
import java.util.Set;
99
import java.util.stream.Collectors;
1010

11+
import sqlancer.common.query.ExpectedErrors;
12+
import sqlancer.common.query.QueryAdapter;
13+
import sqlancer.common.query.SQLancerResultSet;
14+
1115
public final class ComparatorHelper {
1216

1317
private ComparatorHelper() {

‎src/sqlancer/GlobalState.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import sqlancer.Main.QueryManager;
77
import sqlancer.Main.StateLogger;
8+
import sqlancer.common.query.Query;
9+
import sqlancer.common.query.SQLancerResultSet;
810

911
/**
1012
* Represents a global state that is valid for a testing session on a given database.

‎src/sqlancer/Main.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import sqlancer.citus.CitusProvider;
3030
import sqlancer.clickhouse.ClickHouseProvider;
3131
import sqlancer.cockroachdb.CockroachDBProvider;
32+
import sqlancer.common.query.Query;
33+
import sqlancer.common.query.SQLancerResultSet;
3234
import sqlancer.duckdb.DuckDBProvider;
3335
import sqlancer.mariadb.MariaDBProvider;
3436
import sqlancer.mysql.MySQLProvider;

‎src/sqlancer/StateToReproduce.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import sqlancer.clickhouse.ClickHouseSchema;
1010
import sqlancer.clickhouse.ast.ClickHouseConstant;
1111
import sqlancer.clickhouse.ast.ClickHouseExpression;
12+
import sqlancer.common.query.Query;
13+
import sqlancer.common.query.QueryAdapter;
1214
import sqlancer.mysql.MySQLSchema.MySQLColumn;
1315
import sqlancer.mysql.ast.MySQLConstant;
1416
import sqlancer.mysql.ast.MySQLExpression;

‎src/sqlancer/StatementExecutor.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7+
import sqlancer.common.query.Query;
8+
79
public class StatementExecutor<G extends GlobalState<?, ?>, A extends AbstractAction<G>> {
810

911
private final G globalState;

‎src/sqlancer/citus/CitusProvider.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@
1212
import java.util.stream.Collectors;
1313

1414
import sqlancer.AbstractAction;
15-
import sqlancer.ExpectedErrors;
1615
import sqlancer.IgnoreMeException;
17-
import sqlancer.Query;
18-
import sqlancer.QueryAdapter;
19-
import sqlancer.QueryProvider;
2016
import sqlancer.Randomly;
21-
import sqlancer.SQLancerResultSet;
2217
import sqlancer.StatementExecutor;
2318
import sqlancer.citus.gen.CitusAlterTableGenerator;
2419
import sqlancer.citus.gen.CitusCommon;
@@ -30,6 +25,11 @@
3025
import sqlancer.citus.gen.CitusViewGenerator;
3126
import sqlancer.common.oracle.CompositeTestOracle;
3227
import sqlancer.common.oracle.TestOracle;
28+
import sqlancer.common.query.ExpectedErrors;
29+
import sqlancer.common.query.Query;
30+
import sqlancer.common.query.QueryAdapter;
31+
import sqlancer.common.query.QueryProvider;
32+
import sqlancer.common.query.SQLancerResultSet;
3333
import sqlancer.postgres.PostgresGlobalState;
3434
import sqlancer.postgres.PostgresOptions;
3535
import sqlancer.postgres.PostgresProvider;

‎src/sqlancer/citus/gen/CitusAlterTableGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.util.List;
44

5-
import sqlancer.ExpectedErrors;
65
import sqlancer.IgnoreMeException;
7-
import sqlancer.Query;
6+
import sqlancer.common.query.ExpectedErrors;
7+
import sqlancer.common.query.Query;
88
import sqlancer.postgres.PostgresGlobalState;
99
import sqlancer.postgres.PostgresSchema.PostgresTable;
1010
import sqlancer.postgres.gen.PostgresAlterTableGenerator;

‎src/sqlancer/citus/gen/CitusCommon.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package sqlancer.citus.gen;
22

3-
import sqlancer.ExpectedErrors;
3+
import sqlancer.common.query.ExpectedErrors;
44
import sqlancer.postgres.PostgresGlobalState;
55
import sqlancer.postgres.PostgresSchema.PostgresTable;
66
import sqlancer.postgres.gen.PostgresCommon;

‎src/sqlancer/citus/gen/CitusDeleteGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sqlancer.citus.gen;
22

3-
import sqlancer.ExpectedErrors;
4-
import sqlancer.Query;
3+
import sqlancer.common.query.ExpectedErrors;
4+
import sqlancer.common.query.Query;
55
import sqlancer.postgres.PostgresGlobalState;
66
import sqlancer.postgres.gen.PostgresDeleteGenerator;
77

0 commit comments

Comments
 (0)