Updated JaQue library

Author: CollinAlpert

README.MD

@@ -56,7 +56,7 @@ You can include the Maven dependency:
 <dependency>
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
     <packaging>jar</packaging>
 
     <name>lambda2sql</name>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.trigersoft</groupId>
             <artifactId>jaque</artifactId>
-            <version>2.2.1</version>
+            <version>2.3.0</version>
         </dependency>
 
         <dependency>

src/main/java/com/github/collinalpert/lambda2sql/ToSqlVisitor.java

@@ -2,6 +2,7 @@
 
 import com.trigersoft.jaque.expression.BinaryExpression;
 import com.trigersoft.jaque.expression.ConstantExpression;
+import com.trigersoft.jaque.expression.DelegateExpression;
 import com.trigersoft.jaque.expression.Expression;
 import com.trigersoft.jaque.expression.ExpressionType;
 import com.trigersoft.jaque.expression.ExpressionVisitor;
@@ -61,6 +62,16 @@ private static String toSqlOp(int expressionType) {
 	 */
 	@Override
 	public StringBuilder visit(BinaryExpression e) {
+		//Handling for null parameters
+		if (e.getSecond() instanceof ParameterExpression && arguments.top().get(((ParameterExpression) e.getSecond()).getIndex()).getValue() == null) {
+			if (e.getExpressionType() == ExpressionType.Equal) {
+				return Expression.isNull(e.getFirst()).accept(this);
+			}
+			if (e.getExpressionType() == ExpressionType.NotEqual) {
+				return Expression.unary(ExpressionType.LogicalNot, boolean.class, Expression.unary(ExpressionType.IsNull, boolean.class, e.getFirst())).accept(this);
+			}
+		}
+
 		boolean quote = e != this.body && e.getExpressionType() == ExpressionType.LogicalOr;
 
 		if (quote) sb.append('(');
@@ -83,10 +94,12 @@ public StringBuilder visit(BinaryExpression e) {
 	 */
 	@Override
 	public StringBuilder visit(ConstantExpression e) {
+		if (e.getValue() instanceof LambdaExpression) {
+			((LambdaExpression) e.getValue()).getBody().accept(this);
+			return sb;
+		}
 		if (e.getValue() == null) {
-			sb.deleteCharAt(sb.length() - 1);
-			sb.delete(sb.lastIndexOf(" "), sb.length());
-			return sb.append(" IS NULL");
+			return sb.append("NULL");
 		}
 		if (e.getValue() instanceof String) {
 			return sb.append("'").append(e.getValue().toString()).append("'");
@@ -129,6 +142,11 @@ public StringBuilder visit(LambdaExpression<?> e) {
 		return e.getBody().accept(this);
 	}
 
+	@Override
+	public StringBuilder visit(DelegateExpression e) {
+		return e.getDelegate().accept(this);
+	}
+
 	/**
 	 * An expression which represents a getter, and thus a field in a database, in the lambda expression.
 	 * For example:
@@ -158,6 +176,9 @@ public StringBuilder visit(MemberExpression e) {
 	@Override
 	public StringBuilder visit(ParameterExpression e) {
 		arguments.top().get(e.getIndex()).accept(this);
+		if (e.getIndex() == arguments.top().size() - 1) {
+			arguments.pop();
+		}
 		return sb;
 	}
 
@@ -172,6 +193,11 @@ public StringBuilder visit(ParameterExpression e) {
 	 */
 	@Override
 	public StringBuilder visit(UnaryExpression e) {
+		if (e.getFirst() instanceof UnaryExpression && e.getExpressionType() == ExpressionType.LogicalNot) {
+			if (e.getFirst().getExpressionType() == ExpressionType.IsNull) {
+				return ((UnaryExpression) e.getFirst()).getFirst().accept(this).append(" IS NOT NULL");
+			}
+		}
 		if (e.getExpressionType() == ExpressionType.IsNull) {
 			return e.getFirst().accept(this).append(" IS NULL");
 		}

src/test/java/com/github/collinalpert/lambda2sql/test/Lambda2SqlTest.java

@@ -53,18 +53,18 @@ void testMethodReferences() {
 
 	@Test
 	void testAndFunction() {
-		var id = 1;
+		var id = 2;
 		SqlPredicate<IPerson> personPredicate = person -> person.getId() == id;
 		SqlPredicate<IPerson> personSqlPredicateAnd = personPredicate.and(x -> true);
-		assertPredicateEqual("person.id = 1 AND true", personSqlPredicateAnd);
+		assertPredicateEqual("person.id = 2 AND true", personSqlPredicateAnd);
 	}
 
 	@Test
 	void testOrFunction() {
-		var id = 1;
+		var id = 2;
 		SqlPredicate<IPerson> personPredicate = person -> person.getId() == id;
 		SqlPredicate<IPerson> personSqlPredicateOr = personPredicate.or(x -> true);
-		assertPredicateEqual("person.id = 1 OR true", personSqlPredicateOr);
+		assertPredicateEqual("person.id = 2 OR true", personSqlPredicateOr);
 	}
 
 	@Test
@@ -88,12 +88,32 @@ void testNestedProperties() {
 	void testNull() {
 		String isNull = null;
 		Integer i = null;
-		SqlPredicate<IPerson> p = person -> person.getName() == isNull;
+		var age = 17;
+		SqlPredicate<IPerson> p = person -> person.getAge() == age || person.getName() == isNull;
 		SqlPredicate<IPerson> p2 = person -> person.getName() == null;
-		SqlPredicate<IPerson> p3 = person -> person.getAge() >= i;
-		assertPredicateEqual("person.name IS NULL", p);
+		SqlPredicate<IPerson> p3 = person -> person.getAge() >= i && person.getAge() <= age;
+		assertPredicateEqual("person.age = 17 OR person.name IS NULL", p);
 		assertPredicateEqual("person.name IS NULL", p2);
-		assertPredicateEqual("person.age IS NULL", p3);
+		assertPredicateEqual("person.age >= NULL AND person.age <= 17", p3);
+	}
+
+	@Test
+	void testNotNull() {
+		String isNull = null;
+		var age = 17;
+		SqlPredicate<IPerson> p = person -> person.getAge() == age || person.getName() != isNull;
+		SqlPredicate<IPerson> p2 = person -> person.getName() != null;
+		assertPredicateEqual("person.age = 17 OR person.name IS NOT NULL", p);
+		assertPredicateEqual("person.name IS NOT NULL", p2);
+	}
+
+	@Test
+	void testParentheses() {
+		var age = 18;
+		SqlPredicate<IPerson> p = person -> person.getAge() == age && person.isAdult() || person.getName() == "Steve";
+		SqlPredicate<IPerson> p2 = person -> person.getAge() == age && (person.isAdult() || person.getName() == "Steve");
+		assertPredicateEqual("person.age = 18 AND person.isAdult OR person.name = 'Steve'", p);
+		assertPredicateEqual("person.age = 18 AND (person.isAdult OR person.name = 'Steve')", p2);
 	}
 
 	private void assertPredicateEqual(String expectedSql, SqlPredicate<IPerson> p) {