Added OR WHERE clause functionality

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.7</version>
+    <version>1.8</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.collinalpert</groupId>
     <artifactId>lambda2sql</artifactId>
-    <version>1.7</version>
+    <version>1.8</version>
     <packaging>jar</packaging>
 
     <name>lambda2sql</name>
@@ -141,14 +141,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>

src/main/java/com/github/collinalpert/lambda2sql/functions/SqlPredicate.java

@@ -17,4 +17,9 @@ default SqlPredicate<T> and(SqlPredicate<? super T> other) {
 		Objects.requireNonNull(other);
 		return t -> test(t) && other.test(t);
 	}
+
+	default SqlPredicate<T> or(SqlPredicate<? super T> other) {
+		Objects.requireNonNull(other);
+		return t -> test(t) || other.test(t);
+	}
 }

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

@@ -0,0 +1,10 @@
+package com.github.collinalpert.lambda2sql.test;
+
+/**
+ * @author Collin Alpert
+ */
+public interface ICar {
+	String getModel();
+
+	String getColor();
+}

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

@@ -1,6 +1,6 @@
 package com.github.collinalpert.lambda2sql.test;
 
-public interface Person {
+public interface IPerson {
 	long getId();
 
 	String getName();
@@ -11,6 +11,8 @@ public interface Person {
 
 	boolean isActive();
 
+	ICar getCar();
+
 	default boolean isAdult() {
 		return getAge() >= 18;
 	}

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

@@ -40,31 +40,46 @@ void testWithVariables() {
 
 	@Test
 	void testFunction() {
-		assertFunctionEqual("name", Person::getName);
+		assertFunctionEqual("name", IPerson::getName);
 		assertFunctionEqual("age", person -> person.getAge());
 	}
 
 	@Test
 	void testMethodReferences() {
-		SqlPredicate<Person> person = Person::isAdult;
-		SqlPredicate<Person> personAnd = person.and(x -> true);
+		SqlPredicate<IPerson> person = IPerson::isAdult;
+		SqlPredicate<IPerson> personAnd = person.and(x -> true);
 		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);
+	void testAndFunction() {
+		var id = 1;
+		SqlPredicate<IPerson> personPredicate = person -> person.getId() == id;
+		SqlPredicate<IPerson> personSqlPredicateAnd = personPredicate.and(x -> true);
 		assertPredicateEqual("person.id = 1 AND true", personSqlPredicateAnd);
 	}
 
-	private void assertPredicateEqual(String expectedSql, SqlPredicate<Person> p) {
+	@Test
+	void testOrFunction() {
+		var id = 1;
+		SqlPredicate<IPerson> personPredicate = person -> person.getId() == id;
+		SqlPredicate<IPerson> personSqlPredicateAnd = personPredicate.or(x -> true);
+		assertPredicateEqual("person.id = 1 OR true", personSqlPredicateAnd);
+	}
+
+	@Test
+	void testNestedProperties() {
+		SqlPredicate<IPerson> p = person -> person.getCar().getModel() == "Mercedes";
+		var sql = Lambda2Sql.toSql(p, "car");
+		Assertions.assertEquals("car.model = 'Mercedes'", sql);
+	}
+
+	private void assertPredicateEqual(String expectedSql, SqlPredicate<IPerson> p) {
 		var sql = Lambda2Sql.toSql(p, "person");
 		Assertions.assertEquals(expectedSql, sql);
 	}
 
-	private void assertFunctionEqual(String expectedSql, SqlFunction<Person, ?> function) {
+	private void assertFunctionEqual(String expectedSql, SqlFunction<IPerson, ?> function) {
 		var sql = Lambda2Sql.toSql(function);
 		Assertions.assertEquals(expectedSql, sql);
 	}