Added explicit table name to where conditions

Author: CollinAlpert

.gitignore

@@ -1,3 +1,3 @@
-.gradle
 .idea
 target
+out

README.MD

@@ -1,21 +1,24 @@
 Lambda2sql (lambda) -> "sql"
 ==========
 
-**Please note:** This is a Java 10 library so make sure you have at least Java 10 installed when using it.
+**Please note:** This is a Java 11 library so make sure you have at least Java 11 installed when using it.
 
 Convert Java 8 lambdas to SQL statements.
 
-For example, the following Predicate<Person>:
+For example, the following ``SqlPredicate<Person>``:
 ```jshelllanguage
  person -> person.getAge() < 100 && person.getHeight() > 200
 ```
 
 is converted to a string:
 
 ```
-  age < 100 AND height > 200
+  person.age < 100 AND person.height > 200
 ```
 allowing you to write readable queries in a type safe way.
+
+**Note:** Remember to annotate the class used in the ``Predicate<T>`` with the ``TableName`` attribute.
+If the attribute is not supplied, the class in lower case characters will be used. 
 
 Usage
 ---------
@@ -25,10 +28,9 @@ int age = 100;
 int height = 200;
 SqlPredicate<Person> predicate = person -> person.getAge() < age && person.getHeight() > height;
 
-String sql = Lambda2Sql.toSql(predicate); // age < 100 AND height > 200
+String sql = Lambda2Sql.toSql(predicate); // person.age < 100 AND person.height > 200
 ```
 
-
 How it works
 ---------
 
@@ -57,7 +59,7 @@ You can include the Maven dependency:
 <dependency>
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.0</version>
+    <version>1.6</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
     <packaging>jar</packaging>
 
     <name>lambda2sql</name>
@@ -57,6 +57,7 @@
             <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -123,6 +124,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>

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

@@ -0,0 +1,17 @@
+package com.github.collinalpert.lambda2sql;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the SQL table name.
+ *
+ * @author Collin Alpert
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TableName {
+	String value();
+}

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

@@ -133,7 +133,14 @@ public StringBuilder visit(MemberExpression e) {
 		String name = e.getMember().getName();
 		name = name.replaceAll("^(get)", "");
 		name = name.substring(0, 1).toLowerCase() + name.substring(1);
-		return sb.append(name);
+		var annotation = e.getMember().getDeclaringClass().getAnnotation(TableName.class);
+		String tableName;
+		if (annotation != null) {
+			tableName = annotation.value();
+		} else {
+			tableName = e.getMember().getDeclaringClass().getSimpleName().toLowerCase();
+		}
+		return sb.append(tableName).append(".").append(name);
 	}
 
 	/**

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

@@ -9,38 +9,38 @@ class Lambda2SqlTest {
 
 	@Test
 	void testComparisons() {
-		assertPredicateEqual("age = 1", e -> e.getAge() == 1);
-		assertPredicateEqual("age > 1", e -> e.getAge() > 1);
-		assertPredicateEqual("age < 1", e -> e.getAge() < 1);
-		assertPredicateEqual("age >= 1", e -> e.getAge() >= 1);
-		assertPredicateEqual("age <= 1", e -> e.getAge() <= 1);
-		assertPredicateEqual("age != 1", e -> e.getAge() != 1);
+		assertPredicateEqual("person.age = 1", e -> e.getAge() == 1);
+		assertPredicateEqual("person.age > 1", e -> e.getAge() > 1);
+		assertPredicateEqual("person.age < 1", e -> e.getAge() < 1);
+		assertPredicateEqual("person.age >= 1", e -> e.getAge() >= 1);
+		assertPredicateEqual("person.age <= 1", e -> e.getAge() <= 1);
+		assertPredicateEqual("person.age != 1", e -> e.getAge() != 1);
 	}
 
 	@Test
 	void testLogicalOps() {
-		assertPredicateEqual("!isActive", e -> !e.isActive());
-		assertPredicateEqual("age < 100 AND height > 200", e -> e.getAge() < 100 && e.getHeight() > 200);
-		assertPredicateEqual("age < 100 OR height > 200", e -> e.getAge() < 100 || e.getHeight() > 200);
+		assertPredicateEqual("!person.isActive", e -> !e.isActive());
+		assertPredicateEqual("person.age < 100 AND person.height > 200", e -> e.getAge() < 100 && e.getHeight() > 200);
+		assertPredicateEqual("person.age < 100 OR person.height > 200", e -> e.getAge() < 100 || e.getHeight() > 200);
 	}
 
 	@Test
 	void testMultipleLogicalOps() {
-		assertPredicateEqual("isActive AND (age < 100 OR height > 200)", e -> e.isActive() && (e.getAge() < 100 || e.getHeight() > 200));
-		assertPredicateEqual("(age < 100 OR height > 200) AND isActive", e -> (e.getAge() < 100 || e.getHeight() > 200) && e.isActive());
+		assertPredicateEqual("person.isActive AND (person.age < 100 OR person.height > 200)", e -> e.isActive() && (e.getAge() < 100 || e.getHeight() > 200));
+		assertPredicateEqual("(person.age < 100 OR person.height > 200) AND person.isActive", e -> (e.getAge() < 100 || e.getHeight() > 200) && e.isActive());
 	}
 
 	@Test
 	void testWithVariables() {
 		var name = "Donald";
 		var age = 80;
-		assertPredicateEqual("name = 'Donald' AND age > 80", person -> person.getName() == name && person.getAge() > age);
+		assertPredicateEqual("person.name = 'Donald' AND person.age > 80", person -> person.getName() == name && person.getAge() > age);
 	}
 
 	@Test
 	void testFunction() {
-		assertFunctionEqual("name", Person::getName);
-		assertFunctionEqual("age", person -> person.getAge());
+		assertFunctionEqual("person.name", Person::getName);
+		assertFunctionEqual("person.age", person -> person.getAge());
 	}
 
 	private void assertPredicateEqual(String expectedSql, SqlPredicate<Person> p) {

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

@@ -1,5 +1,6 @@
 package com.github.collinalpert.lambda2sql;
 
+@TableName("person")
 public interface Person {
 	String getName();