Fix empty block checkstyle issues and ensure that DBMS names are written in lowercase

mrigger · mrigger · commit 923c682edc1d · 2020-05-26T17:47:32.000+02:00
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -153,7 +153,7 @@
         <!-- Checks for blocks. You know, those {}'s         -->
         <!-- See https://checkstyle.org/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
-        <!-- TODO: <module name="EmptyBlock"/> -->
+        <module name="EmptyBlock"/>
         <module name="LeftCurly"/>
         <module name="NeedBraces"/>
         <module name="RightCurly"/>
@@ -186,13 +186,10 @@
         <!-- <module name="TodoComment"/> -->
         <module name="UpperEll"/>
 
-        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
-        <module name="SuppressionXpathFilter">
-            <property name="file" value="${org.checkstyle.sun.suppressionxpathfilter.config}"
-                      default="checkstyle-xpath-suppressions.xml" />
-            <property name="optional" value="true"/>
-        </module>
 
+		
+	    <module name="SuppressionCommentFilter"/>
+          
     </module>
 
 </module>
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -282,6 +282,9 @@ public static void main(String[] args) {
 		Builder commandBuilder = JCommander.newBuilder().addObject(options);
 		for (DatabaseProvider<?, ?> provider : providers) {
 			String name = provider.getDBMSName();
+			if (!name.toLowerCase().equals(name)) {
+				throw new AssertionError(name + " should be in lowercase!");
+			}
 			Object command = provider.getCommand();
 			if (command == null) {
 				throw new IllegalStateException();
diff --git a/src/sqlancer/clickhouse/ClickhouseProvider.java b/src/sqlancer/clickhouse/ClickhouseProvider.java
@@ -148,7 +148,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException
 
 	@Override
 	public String getDBMSName() {
-		return "Clickhouse";
+		return "clickhouse";
 	}
 
 	@Override
diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -176,7 +176,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException
 
 	@Override
 	public String getDBMSName() {
-		return "DuckDB";
+		return "duckdb";
 	}
 
 	@Override
diff --git a/src/sqlancer/mysql/gen/MySQLTableGenerator.java b/src/sqlancer/mysql/gen/MySQLTableGenerator.java
@@ -45,9 +45,7 @@ private Query create() {
 		List<String> errors = new ArrayList<>();
 
 		sb.append("CREATE");
-		if (Randomly.getBoolean()) {
-//			sb.append(" TEMPORARY"); // FIXME support temporary tables in the schema
-		}
+		// TODO support temporary tables in the schema
 		sb.append(" TABLE");
 		if (Randomly.getBoolean()) {
 			sb.append(" IF NOT EXISTS");
diff --git a/src/sqlancer/mysql/test/MySQLPivotedQuerySynthesisTester.java b/src/sqlancer/mysql/test/MySQLPivotedQuerySynthesisTester.java
@@ -56,9 +56,7 @@ public void check() throws SQLException {
 				throw new AssertionError(queryString);
 			}
 		} catch (SQLException e) {
-			if (e.getMessage().contains("BIGINT value is out of range")) {
-				// IGNORE
-			} else {
+			if (!e.getMessage().contains("BIGINT value is out of range")) {
 				throw e;
 			}
 		}
diff --git a/src/sqlancer/postgres/gen/PostgresQueryCatalogGenerator.java b/src/sqlancer/postgres/gen/PostgresQueryCatalogGenerator.java
@@ -36,9 +36,12 @@ public static Query query() {
 			public boolean execute(Connection con) throws SQLException {
 				try (Statement s = con.createStatement()) {
 					try (ResultSet rs = s.executeQuery(getQueryString())) {
+						// CHECKSTYLE:OFF
 						while (rs.next()) {
-							// do nothing
+							// only force the DBMS to fetch the records and hope that they cause an
+							// invalid state
 						}
+						// CHECKSTYLE:ON
 					}
 				}
 				return true;
diff --git a/src/sqlancer/sqlite3/ast/SQLite3Cast.java b/src/sqlancer/sqlite3/ast/SQLite3Cast.java
@@ -218,14 +218,6 @@ private static boolean unprintAbleCharThatLetsBecomeNumberZero(String s) {
 
 	static Connection castDatabase;
 
-	static {
-//		try {
-////			castDatabase = new SQLite3Provider().createDatabase("test", null);
-//		} catch (SQLException e) {
-//			throw new AssertionError(e);
-//		}
-	}
-
 	public static SQLite3Constant castToText(SQLite3Constant cons) {
 		if (cons.getDataType() == SQLite3DataType.TEXT) {
 			return cons;
diff --git a/src/sqlancer/tidb/TiDBProvider.java b/src/sqlancer/tidb/TiDBProvider.java
@@ -213,7 +213,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException
 
 	@Override
 	public String getDBMSName() {
-		return "TiDB";
+		return "tidb";
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException`
`148`	`148`
`149`	`149`	`@Override`
`150`	`150`	`public String getDBMSName() {`
`151`		`- return "Clickhouse";`
	`151`	`+ return "clickhouse";`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException`
`176`	`176`
`177`	`177`	`@Override`
`178`	`178`	`public String getDBMSName() {`
`179`		`- return "DuckDB";`
	`179`	`+ return "duckdb";`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ public void check() throws SQLException {`
`56`	`56`	`throw new AssertionError(queryString);`
`57`	`57`	`}`
`58`	`58`	`} catch (SQLException e) {`
`59`		`- if (e.getMessage().contains("BIGINT value is out of range")) {`
`60`		`- // IGNORE`
`61`		`- } else {`
	`59`	`+ if (!e.getMessage().contains("BIGINT value is out of range")) {`
`62`	`60`	`throw e;`
`63`	`61`	`}`
`64`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,12 @@ public static Query query() {`
`36`	`36`	`public boolean execute(Connection con) throws SQLException {`
`37`	`37`	`try (Statement s = con.createStatement()) {`
`38`	`38`	`try (ResultSet rs = s.executeQuery(getQueryString())) {`
	`39`	`+ // CHECKSTYLE:OFF`
`39`	`40`	`while (rs.next()) {`
`40`		`- // do nothing`
	`41`	`+ // only force the DBMS to fetch the records and hope that they cause an`
	`42`	`+ // invalid state`
`41`	`43`	`}`
	`44`	`+ // CHECKSTYLE:ON`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public Connection createDatabase(GlobalState<?> globalState) throws SQLException`
`213`	`213`
`214`	`214`	`@Override`
`215`	`215`	`public String getDBMSName() {`
`216`		`- return "TiDB";`
	`216`	`+ return "tidb";`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`@Override`