Fixed workaround for bug in JaQue library

Author: CollinAlpert

src/main/java/lambda2sql/ToSqlVisitor.java

@@ -3,14 +3,15 @@
 import com.trigersoft.jaque.expression.*;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import static com.trigersoft.jaque.expression.ExpressionType.*;
 
 public class ToSqlVisitor implements ExpressionVisitor<StringBuilder> {
 
 	private StringBuilder sb = new StringBuilder();
 	private Expression body;
-	private ArrayList<ConstantExpression> parameters = new ArrayList<>();
+	private List<ConstantExpression> parameters = new ArrayList<>();
 
 	private static String toSqlOp(int expressionType) {
 		switch (expressionType) {
@@ -20,6 +21,8 @@ private static String toSqlOp(int expressionType) {
 				return "AND";
 			case LogicalOr:
 				return "OR";
+			case Convert:
+				return "";
 		}
 		return ExpressionType.toString(expressionType);
 	}
@@ -76,7 +79,7 @@ public StringBuilder visit(ParameterExpression e) {
 
 	@Override
 	public StringBuilder visit(UnaryExpression e) {
-		sb.append(ExpressionType.toString(e.getExpressionType()));
+		sb.append(toSqlOp(e.getExpressionType()));
 		return e.getFirst().accept(this);
 	}
 

src/test/java/lambda2sql/Lambda2SqlTest.java

@@ -31,7 +31,10 @@ public void testMultipleLogicalOps() {
 	@Test
 	public void testWithVariables() {
 		String name = "Donald";
-		assertEqual("name = 'Donald'", person -> person.getName() == name);
+		//Datatype must be "Integer" for now. This is due to a bug in the JaQue library and author has been notified.
+		//As soon as the bug is fixed, the test will be updated.
+		Integer age = 80;
+		assertEqual("name = 'Donald' AND age > 80", person -> person.getName() == name && person.getAge() > age);
 	}
 
 	private void assertEqual(String expectedSql, SqlPredicate<Person> p) {