Using parameters in combination with higher level functions works now.

Author: CollinAlpert

README.MD

@@ -46,7 +46,7 @@ Features
 
 Current version works with predicates, functions and supports the following operators: >, >=, <, <=, =, !=, &&, ||, !
 
-Feel free to open an issue with any requests you might have.`
+Feel free to open an issue with any requests you might have.
 
 Install
 -------
@@ -56,7 +56,7 @@ You can include the Maven dependency:
 <dependency>
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.6.3</version>
+    <version>1.6.4</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.6.3</version>
+    <version>1.6.4</version>
     <packaging>jar</packaging>
 
     <name>lambda2sql</name>

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

@@ -16,8 +16,7 @@ public class Lambda2Sql {
 	 * Supported operators: {@code >,>=,<,<=,=,!=,&&,||,!}
 	 *
 	 * @param functionalInterface A {@link FunctionalInterface} lambda to convert.
-	 * @param prefix              An optional prefix to proceed the column name.
-	 *                            Usually it is supposed to be used to reference the column name including the table name.
+	 * @param prefix              An optional prefix to proceed the column name. Usually it is the table name.
 	 * @return A {@link String} describing the SQL where condition.
 	 */
 	public static String toSql(SerializedFunctionalInterface functionalInterface, String prefix) {

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

@@ -25,7 +25,7 @@ public class ToSqlVisitor implements ExpressionVisitor<StringBuilder> {
 	private Expression body;
 	private List<ConstantExpression> parameters;
 
-	public ToSqlVisitor(String prefix) {
+	ToSqlVisitor(String prefix) {
 		this.prefix = prefix;
 		this.sb = new StringBuilder();
 		this.parameters = new LinkedList<>();
@@ -102,7 +102,7 @@ public StringBuilder visit(ConstantExpression e) {
 	public StringBuilder visit(InvocationExpression e) {
 		e.getArguments()
 				.stream()
-				.filter(x -> x instanceof ConstantExpression)
+				.filter(x -> x instanceof ConstantExpression && x.getResultType() != LambdaExpression.class)
 				.map(ConstantExpression.class::cast)
 				.forEach(parameters::add);
 		return e.getTarget().accept(this);

…linalpert/lambda2sql/Lambda2SqlTest.java …pert/lambda2sql/test/Lambda2SqlTest.javasrc/test/java/com/github/collinalpert/lambda2sql/Lambda2SqlTest.java renamed to src/test/java/com/github/collinalpert/lambda2sql/test/Lambda2SqlTest.java src/test/java/com/github/collinalpert/lambda2sql/Lambda2SqlTest.java renamed to src/test/java/com/github/collinalpert/lambda2sql/test/Lambda2SqlTest.java

@@ -1,8 +1,8 @@
-package com.github.collinalpert.lambda2sql;
+package com.github.collinalpert.lambda2sql.test;
 
+import com.github.collinalpert.lambda2sql.Lambda2Sql;
 import com.github.collinalpert.lambda2sql.functions.SqlFunction;
 import com.github.collinalpert.lambda2sql.functions.SqlPredicate;
-import com.trigersoft.jaque.expression.LambdaExpression;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -48,15 +48,15 @@ void testFunction() {
 	void testMethodReferences() {
 		SqlPredicate<Person> person = Person::isAdult;
 		SqlPredicate<Person> personAnd = person.and(x -> true);
-		LambdaExpression<SqlPredicate<Person>> lambda = LambdaExpression.parse(personAnd);
+		assertPredicateEqual("person.isAdult AND true", personAnd);
 	}
 
 	@Test
 	void testGetById() {
 		int id = 1;
 		SqlPredicate<Person> personPredicate = person -> person.getId() == id;
 		SqlPredicate<Person> personSqlPredicateAnd = personPredicate.and(x -> true);
-		LambdaExpression<SqlPredicate<Person>> pred = LambdaExpression.parse(personSqlPredicateAnd);
+		assertPredicateEqual("person.id = 1 AND true", personSqlPredicateAnd);
 	}
 
 	private void assertPredicateEqual(String expectedSql, SqlPredicate<Person> p) {

…thub/collinalpert/lambda2sql/Person.java …collinalpert/lambda2sql/test/Person.javasrc/test/java/com/github/collinalpert/lambda2sql/Person.java renamed to src/test/java/com/github/collinalpert/lambda2sql/test/Person.java src/test/java/com/github/collinalpert/lambda2sql/Person.java renamed to src/test/java/com/github/collinalpert/lambda2sql/test/Person.java

@@ -1,4 +1,4 @@
-package com.github.collinalpert.lambda2sql;
+package com.github.collinalpert.lambda2sql.test;
 
 public interface Person {
 	long getId();