[MySQL] Fix warnings

mrigger · mrigger · commit 4073f6e9a51f · 2020-05-27T17:20:44.000+02:00
diff --git a/src/sqlancer/mysql/MySQLBugs.java b/src/sqlancer/mysql/MySQLBugs.java
@@ -16,4 +16,7 @@ public class MySQLBugs {
     // https://bugs.mysql.com/bug.php?id=95894
     public static boolean bug95894 = true;
 
+    // https://bugs.mysql.com/bug.php?id=99135
+    public static boolean bug99135 = true;
+
 }
diff --git a/src/sqlancer/mysql/MySQLExpectedValueVisitor.java b/src/sqlancer/mysql/MySQLExpectedValueVisitor.java
@@ -1,5 +1,6 @@
 package sqlancer.mysql;
 
+import sqlancer.IgnoreMeException;
 import sqlancer.mysql.ast.MySQLBetweenOperation;
 import sqlancer.mysql.ast.MySQLBinaryComparisonOperation;
 import sqlancer.mysql.ast.MySQLBinaryLogicalOperation;
@@ -37,14 +38,11 @@ private void print(MySQLExpression expr) {
     @Override
     public void visit(MySQLExpression expr) {
         nrTabs++;
-        if (true) {
-            throw new AssertionError("TODO");
+        try {
+            MySQLVisitor.super.visit(expr);
+        } catch (IgnoreMeException e) {
+
         }
-        // try {
-        // super.visit(expr);
-        // } catch (IgnoreMeException e) {
-        //
-        // }
         nrTabs--;
     }
 
diff --git a/src/sqlancer/mysql/gen/MySQLExpressionGenerator.java b/src/sqlancer/mysql/gen/MySQLExpressionGenerator.java
@@ -89,8 +89,7 @@ public MySQLExpression generateExpression(int depth) {
             }
             return new MySQLInOperation(expr, rightList, Randomly.getBoolean());
         case BINARY_OPERATION:
-            if (true) {
-                /* workaround for https://bugs.mysql.com/bug.php?id=99135 */
+            if (MySQLBugs.bug99135) {
                 throw new IgnoreMeException();
             }
             return new MySQLBinaryOperation(generateExpression(depth + 1), generateExpression(depth + 1),

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,7 @@ public class MySQLBugs {`
`16`	`16`	`// https://bugs.mysql.com/bug.php?id=95894`
`17`	`17`	`public static boolean bug95894 = true;`
`18`	`18`
	`19`	`+ // https://bugs.mysql.com/bug.php?id=99135`
	`20`	`+ public static boolean bug99135 = true;`
	`21`	`+`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@ public MySQLExpression generateExpression(int depth) {`
`89`	`89`	`}`
`90`	`90`	`return new MySQLInOperation(expr, rightList, Randomly.getBoolean());`
`91`	`91`	`case BINARY_OPERATION:`
`92`		`- if (true) {`
`93`		`- /* workaround for https://bugs.mysql.com/bug.php?id=99135 */`
	`92`	`+ if (MySQLBugs.bug99135) {`
`94`	`93`	`throw new IgnoreMeException();`
`95`	`94`	`}`
`96`	`95`	`return new MySQLBinaryOperation(generateExpression(depth + 1), generateExpression(depth + 1),`