DATAJDBC-309 - Polishing.

Extend In to multi-expression argument. Introduce helper methods in Table to create multiple columns. Introduce factory method on StatementBuilder to create a new builder given a collection of expressions.

Author: mp911de

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Conditions.java

@@ -15,6 +15,10 @@
  */
 package org.springframework.data.relational.core.sql;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.springframework.util.Assert;
 
 /**
@@ -69,11 +73,41 @@ public static Equals isEqual(Expression leftColumnOrExpression, Expression right
 	public static Condition in(Expression columnOrExpression, Expression arg) {
 
 		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
-		Assert.notNull(columnOrExpression, "Expression argument must not be null");
+		Assert.notNull(arg, "Expression argument must not be null");
 
 		return In.create(columnOrExpression, arg);
 	}
 
+	/**
+	 * Creates a new {@link In} {@link Condition} given left and right {@link Expression}s.
+	 *
+	 * @param columnOrExpression left hand side of the {@link Condition} must not be {@literal null}.
+	 * @param expressions right hand side (collection {@link Expression}) must not be {@literal null}.
+	 * @return the {@link In} {@link Condition}.
+	 */
+	public static Condition in(Expression columnOrExpression, Collection<? extends Expression> expressions) {
+
+		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
+		Assert.notNull(expressions, "Expression argument must not be null");
+
+		return In.create(columnOrExpression, new ArrayList<>(expressions));
+	}
+
+	/**
+	 * Creates a new {@link In} {@link Condition} given left and right {@link Expression}s.
+	 *
+	 * @param columnOrExpression left hand side of the {@link Condition} must not be {@literal null}.
+	 * @param expressions right hand side (collection {@link Expression}) must not be {@literal null}.
+	 * @return the {@link In} {@link Condition}.
+	 */
+	public static Condition in(Expression columnOrExpression, Expression... expressions) {
+
+		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
+		Assert.notNull(expressions, "Expression argument must not be null");
+
+		return In.create(columnOrExpression, Arrays.asList(expressions));
+	}
+
 	/**
 	 * Creates a {@code IN} {@link Condition clause} for a {@link Select subselect}.
 	 *

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/In.java

@@ -15,26 +15,90 @@
  */
 package org.springframework.data.relational.core.sql;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
 /**
  * {@code IN} {@link Condition} clause.
  *
- * @author Jens Schauder TODO: Accept multiple Expressions.
+ * @author Jens Schauder
+ * @author Mark Paluch
  */
 public class In extends AbstractSegment implements Condition {
 
 	private final Expression left;
-	private final Expression right;
+	private final Collection<Expression> expressions;
 
-	private In(Expression left, Expression right) {
+	private In(Expression left, Collection<Expression> expressions) {
 
-		super(left, right);
+		super(toArray(left, expressions));
 
 		this.left = left;
-		this.right = right;
+		this.expressions = expressions;
 	}
 
+	private static Segment[] toArray(Expression expression, Collection<Expression> expressions) {
+
+		Segment[] segments = new Segment[1 + expressions.size()];
+		segments[0] = expression;
+
+		int index = 1;
+
+		for (Expression e : expressions) {
+			segments[index++] = e;
+		}
+
+		return segments;
+	}
+
+	/**
+	 * Creates a new {@link In} {@link Condition} given left and right {@link Expression}s.
+	 *
+	 * @param columnOrExpression left hand side of the {@link Condition} must not be {@literal null}.
+	 * @param arg right hand side (collection {@link Expression}) must not be {@literal null}.
+	 * @return the {@link In} {@link Condition}.
+	 */
 	public static Condition create(Expression columnOrExpression, Expression arg) {
-		return new In(columnOrExpression, arg);
+
+		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
+		Assert.notNull(arg, "Expression argument must not be null");
+
+		return new In(columnOrExpression, Collections.singletonList(arg));
+	}
+
+	/**
+	 * Creates a new {@link In} {@link Condition} given left and right {@link Expression}s.
+	 *
+	 * @param columnOrExpression left hand side of the {@link Condition} must not be {@literal null}.
+	 * @param expressions right hand side (collection {@link Expression}) must not be {@literal null}.
+	 * @return the {@link In} {@link Condition}.
+	 */
+	public static Condition create(Expression columnOrExpression, Collection<? extends Expression> expressions) {
+
+		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
+		Assert.notNull(expressions, "Expression argument must not be null");
+
+		return new In(columnOrExpression, new ArrayList<>(expressions));
+	}
+
+	/**
+	 * Creates a new {@link In} {@link Condition} given left and right {@link Expression}s.
+	 *
+	 * @param columnOrExpression left hand side of the {@link Condition} must not be {@literal null}.
+	 * @param expressions right hand side (collection {@link Expression}) must not be {@literal null}.
+	 * @return the {@link In} {@link Condition}.
+	 */
+	public static Condition create(Expression columnOrExpression, Expression... expressions) {
+
+		Assert.notNull(columnOrExpression, "Comparison column or expression must not be null");
+		Assert.notNull(expressions, "Expression argument must not be null");
+
+		return new In(columnOrExpression, Arrays.asList(expressions));
 	}
 
 	/*
@@ -43,6 +107,6 @@ public static Condition create(Expression columnOrExpression, Expression arg) {
 	 */
 	@Override
 	public String toString() {
-		return left + " IN " + right;
+		return left + " IN (" + StringUtils.collectionToDelimitedString(expressions, ", ") + ")";
 	}
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/StatementBuilder.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.relational.core.sql;
 
+import java.util.Collection;
+
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectAndFrom;
 
 /**
@@ -50,6 +52,17 @@ public static SelectAndFrom select(Expression... expressions) {
 		return Select.builder().select(expressions);
 	}
 
+	/**
+	 * Include one or more {@link Expression}s in the select list.
+	 *
+	 * @param expressions the expressions to include.
+	 * @return {@code this} builder.
+	 * @see Table#columns(String...)
+	 */
+	public static SelectAndFrom select(Collection<? extends Expression> expressions) {
+		return Select.builder().select(expressions);
+	}
+
 	/**
 	 * Creates a new {@link SelectBuilder}.
 	 *

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Table.java

@@ -16,6 +16,8 @@
 package org.springframework.data.relational.core.sql;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.util.Assert;
@@ -107,6 +109,22 @@ public List<Column> columns(String... names) {
 
 		Assert.notNull(names, "Names must not be null");
 
+		return columns(Arrays.asList(names));
+	}
+
+	/**
+	 * Creates a {@link List} of {@link Column}s associated with this {@link Table}.
+	 * <p/>
+	 * Note: This {@link Table} does not track column creation and there is no possibility to enumerate all
+	 * {@link Column}s that were created for this table.
+	 *
+	 * @param names column names, must not be {@literal null} or empty.
+	 * @return a new {@link List} of {@link Column}s associated with this {@link Table}.
+	 */
+	public List<Column> columns(Collection<String> names) {
+
+		Assert.notNull(names, "Names must not be null");
+
 		List<Column> columns = new ArrayList<>();
 		for (String name : names) {
 			columns.add(column(name));
@@ -139,7 +157,7 @@ public String getName() {
 
 	/**
 	 * @return the table name as it is used in references. This can be the actual {@link #getName() name} or an
-	 *         {@link Aliased#getAlias() alias}.
+	 * {@link Aliased#getAlias() alias}.
 	 */
 	public String getReferenceName() {
 		return name;

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/NaiveSqlRendererUnitTests.java

@@ -217,6 +217,19 @@ public void shouldInWithNamedParameter() {
 		assertThat(NaiveSqlRenderer.render(select)).isEqualTo("SELECT foo.bar FROM foo WHERE foo.bar IN (:name)");
 	}
 
+	@Test // DATAJDBC-309
+	public void shouldInWithNamedParameters() {
+
+		Table table = SQL.table("foo");
+		Column bar = table.column("bar");
+
+		Select select = Select.builder().select(bar).from(table).where(
+				Conditions.in(bar, SQL.bindMarker(":name"), SQL.bindMarker(":name2"))
+		).build();
+
+		assertThat(NaiveSqlRenderer.render(select)).isEqualTo("SELECT foo.bar FROM foo WHERE foo.bar IN (:name, :name2)");
+	}
+
 	@Test // DATAJDBC-309
 	public void shouldRenderInSubselect() {