[MySQL] Support float constants

mrigger · mrigger · commit e774155957b7 · 2020-04-01T10:46:05.000+02:00
diff --git a/src/sqlancer/mysql/ast/MySQLConstant.java b/src/sqlancer/mysql/ast/MySQLConstant.java
@@ -17,6 +17,65 @@ public boolean isNull() {
 		return false;
 	}
 
+	public abstract static class MySQLNoPQSConstant extends MySQLConstant {
+
+		@Override
+		public boolean asBooleanNotNull() {
+			throw throwException();
+		}
+
+		private RuntimeException throwException() {
+			throw new UnsupportedOperationException("not applicable for PQS evaluation!");
+		}
+
+		@Override
+		public MySQLConstant isEquals(MySQLConstant rightVal) {
+			throw throwException();
+
+		}
+
+		@Override
+		public MySQLConstant castAs(CastType type) {
+			throw throwException();
+		}
+
+		@Override
+		public String castAsString() {
+			throw throwException();
+
+		}
+
+		@Override
+		public MySQLDataType getType() {
+			throw throwException();
+		}
+
+		@Override
+		protected MySQLConstant isLessThan(MySQLConstant rightVal) {
+			throw throwException();
+		}
+
+	}
+
+	public static class MySQLDoubleConstant extends MySQLNoPQSConstant {
+
+		private double val;
+
+		public MySQLDoubleConstant(double val) {
+			this.val = val;
+			if (Double.isInfinite(val) || Double.isNaN(val)) {
+				// seems to not be supported by MySQL
+				throw new IgnoreMeException();
+			}
+		}
+
+		@Override
+		public String getTextRepresentation() {
+			return String.valueOf(val);
+		}
+
+	}
+
 	public static class MySQLTextConstant extends MySQLConstant {
 
 		private final String value;
@@ -29,12 +88,11 @@ public MySQLTextConstant(String value) {
 		}
 
 		private void checkIfSmallFloatingPointText() {
-			boolean isSmallFloatingPointText = isString()
-					&& asBooleanNotNull()
+			boolean isSmallFloatingPointText = isString() && asBooleanNotNull()
 					&& castAs(CastType.SIGNED).getInt() == 0;
-				if (isSmallFloatingPointText) {
-					throw new IgnoreMeException();
-				}
+			if (isSmallFloatingPointText) {
+				throw new IgnoreMeException();
+			}
 		}
 
 		@Override
@@ -245,7 +303,7 @@ public MySQLDataType getType() {
 		public boolean isSigned() {
 			return isSigned;
 		}
-		
+
 		private final String getStringRepr() {
 			if (isSigned) {
 				return String.valueOf(value);
diff --git a/src/sqlancer/mysql/gen/MySQLExpressionGenerator.java b/src/sqlancer/mysql/gen/MySQLExpressionGenerator.java
@@ -22,6 +22,7 @@
 import sqlancer.mysql.ast.MySQLComputableFunction;
 import sqlancer.mysql.ast.MySQLComputableFunction.MySQLFunction;
 import sqlancer.mysql.ast.MySQLConstant;
+import sqlancer.mysql.ast.MySQLConstant.MySQLDoubleConstant;
 import sqlancer.mysql.ast.MySQLExists;
 import sqlancer.mysql.ast.MySQLExpression;
 import sqlancer.mysql.ast.MySQLInOperation;
@@ -127,7 +128,7 @@ private MySQLExpression getFunction(int depth) {
 	}
 
 	private enum ConstantType {
-		INT, NULL, STRING;
+		INT, NULL, STRING, DOUBLE;
 	}
 
 	@Override
@@ -151,6 +152,8 @@ public MySQLExpression generateConstant() {
 				return new MySQLCollate(createStringConstant, Randomly.fromOptions("ascii_bin", "binary"));
 			}
 			return createStringConstant;
+		case DOUBLE:
+			return new MySQLDoubleConstant(state.getRandomly().getDouble());
 		default:
 			throw new AssertionError();
 		}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import sqlancer.mysql.ast.MySQLComputableFunction;`
`23`	`23`	`import sqlancer.mysql.ast.MySQLComputableFunction.MySQLFunction;`
`24`	`24`	`import sqlancer.mysql.ast.MySQLConstant;`
	`25`	`+import sqlancer.mysql.ast.MySQLConstant.MySQLDoubleConstant;`
`25`	`26`	`import sqlancer.mysql.ast.MySQLExists;`
`26`	`27`	`import sqlancer.mysql.ast.MySQLExpression;`
`27`	`28`	`import sqlancer.mysql.ast.MySQLInOperation;`
`@@ -127,7 +128,7 @@ private MySQLExpression getFunction(int depth) {`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`private enum ConstantType {`
`130`		`- INT, NULL, STRING;`
	`131`	`+ INT, NULL, STRING, DOUBLE;`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`@Override`
`@@ -151,6 +152,8 @@ public MySQLExpression generateConstant() {`
`151`	`152`	`return new MySQLCollate(createStringConstant, Randomly.fromOptions("ascii_bin", "binary"));`
`152`	`153`	`}`
`153`	`154`	`return createStringConstant;`
	`155`	`+ case DOUBLE:`
	`156`	`+ return new MySQLDoubleConstant(state.getRandomly().getDouble());`
`154`	`157`	`default:`
`155`	`158`	`throw new AssertionError();`
`156`	`159`	`}`