#73 - hacking - fixed an error.

Author: schauder

src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarker.java

@@ -20,11 +20,11 @@
 /**
  * A single indexed bind marker.
  */
-class IndexedBindMarker implements BindMarker {
+public class IndexedBindMarker implements BindMarker {
 
 	private final String placeholder;
 
-	private int index;
+	private final int index;
 
 	IndexedBindMarker(String placeholder, int index) {
 		this.placeholder = placeholder;
@@ -57,4 +57,10 @@ public void bind(Statement statement, Object value) {
 	public void bindNull(Statement statement, Class<?> valueType) {
 		statement.bindNull(this.index, valueType);
 	}
+
+
+	public int getIndex() {
+		return index;
+	}
+
 }

src/main/java/org/springframework/data/r2dbc/function/Bindings.java

@@ -17,7 +17,6 @@
 
 import io.r2dbc.spi.Statement;
 import lombok.RequiredArgsConstructor;
-import lombok.Value;
 
 import java.util.List;
 
@@ -34,6 +33,10 @@ public Bindings(List<SingleBinding> bindings) {
 		this.bindings = bindings;
 	}
 
+	public void apply(Statement statement) {
+		bindings.forEach(sb -> sb.bindTo(statement));
+	}
+
 	@RequiredArgsConstructor
 	public static abstract class SingleBinding<T> {
 
@@ -82,9 +85,9 @@ public void bindTo(Statement statement) {
 
 			if (value.isEmpty()) {
 				statement.bindNull((int) identifier, value.getType());
+			} else {
+				statement.bind((int) identifier, value);
 			}
-
-			statement.bind((int) identifier, value);
 		}
 
 		@Override

src/main/java/org/springframework/data/r2dbc/function/DefaultStatementFactory.java

@@ -17,7 +17,6 @@
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Statement;
-import kotlin.internal.LowPriorityInOverloadResolution;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -32,26 +31,14 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.r2dbc.dialect.BindMarker;
 import org.springframework.data.r2dbc.dialect.BindMarkers;
 import org.springframework.data.r2dbc.dialect.Dialect;
+import org.springframework.data.r2dbc.dialect.IndexedBindMarker;
 import org.springframework.data.r2dbc.domain.SettableValue;
-import org.springframework.data.relational.core.sql.AssignValue;
-import org.springframework.data.relational.core.sql.Assignment;
-import org.springframework.data.relational.core.sql.Column;
-import org.springframework.data.relational.core.sql.Condition;
-import org.springframework.data.relational.core.sql.Delete;
-import org.springframework.data.relational.core.sql.DeleteBuilder;
-import org.springframework.data.relational.core.sql.Expression;
-import org.springframework.data.relational.core.sql.Insert;
-import org.springframework.data.relational.core.sql.SQL;
-import org.springframework.data.relational.core.sql.Select;
-import org.springframework.data.relational.core.sql.SelectBuilder;
-import org.springframework.data.relational.core.sql.StatementBuilder;
-import org.springframework.data.relational.core.sql.Table;
-import org.springframework.data.relational.core.sql.Update;
-import org.springframework.data.relational.core.sql.UpdateBuilder;
+import org.springframework.data.relational.core.sql.*;
 import org.springframework.data.relational.core.sql.render.RenderContext;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.lang.Nullable;
@@ -104,10 +91,44 @@ public void bind(String identifier, SettableValue settable) {
 				select = selectBuilder.build();
 			}
 
-			return new DefaultPreparedOperation<>(select, renderContext, binding);
+			return new DefaultPreparedOperation<>( //
+					select, //
+					renderContext, //
+					createBindings(binding) //
+			);
 		});
 	}
 
+	@NotNull
+	private static Bindings createBindings(Binding binding) {
+
+		List<Bindings.SingleBinding> singleBindings = new ArrayList<>();
+
+		binding.getNulls().forEach( //
+				(bindMarker, settableValue) -> {
+
+					if (bindMarker instanceof IndexedBindMarker) {
+						singleBindings //
+								.add(new Bindings.IndexedSingleBinding( //
+										((IndexedBindMarker) bindMarker).getIndex(), //
+										settableValue) //
+								);
+					}
+				});
+
+		binding.getValues().forEach( //
+				(bindMarker, value) -> {
+					singleBindings //
+							.add(new Bindings.NamedSingleBinding<>( //
+									bindMarker.getPlaceholder(), //
+									value instanceof SettableValue ? (SettableValue) value
+											: SettableValue.from(value)) //
+					);
+				});
+
+		return new Bindings(singleBindings);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.r2dbc.function.StatementFactory#insert(java.lang.String, java.util.Collection, java.util.function.Consumer)
@@ -152,7 +173,7 @@ public void filterBy(String identifier, SettableValue settable) {
 			Insert insert = StatementBuilder.insert().into(table).columns(table.columns(binderBuilder.bindings.keySet()))
 					.values(expressions).build();
 
-			return new DefaultPreparedOperation<Insert>(insert, renderContext, binding) {
+			return new DefaultPreparedOperation<Insert>(insert, renderContext, createBindings(binding)) {
 				@Override
 				public Statement bind(Statement to) {
 					return super.bind(to).returnGeneratedValues(generatedKeysNames.toArray(new String[0]));
@@ -206,7 +227,7 @@ public PreparedOperation<Update> update(String tableName, Consumer<StatementBind
 				update = updateBuilder.build();
 			}
 
-			return new DefaultPreparedOperation<>(update, renderContext, binding);
+			return new DefaultPreparedOperation<>(update, renderContext, createBindings(binding));
 		});
 	}
 
@@ -244,7 +265,7 @@ public void bind(String identifier, SettableValue settable) {
 				delete = deleteBuilder.build();
 			}
 
-			return new DefaultPreparedOperation<>(delete, renderContext, binding);
+			return new DefaultPreparedOperation<>(delete, renderContext, createBindings(binding));
 		});
 	}
 
@@ -364,7 +385,6 @@ private static Condition toCondition(BindMarkers bindMarkers, Column column, Set
 		}
 	}
 
-
 	/**
 	 * Value object holding value and {@code NULL} bindings.
 	 *
@@ -415,16 +435,14 @@ void apply(Statement to) {
 		}
 	}
 
-
 	static abstract class PreparedOperationSupport<T> implements PreparedOperation<T> {
 
 		private Function<String, String> sqlFilter = s -> s;
-		private Function<Binding, Binding> bindingFilter = b -> b;
-
+		private Function<Bindings, Bindings> bindingFilter = b -> b;
 
 		abstract protected String createBaseSql();
 
-		protected abstract Binding getBaseBinding();
+		protected abstract Bindings getBaseBinding();
 
 		/*
 		 * (non-Javadoc)
@@ -435,6 +453,7 @@ public String toQuery() {
 
 			return sqlFilter.apply(createBaseSql());
 		}
+
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.r2dbc.function.PreparedOperation#bind(io.r2dbc.spi.Statement)
@@ -445,14 +464,13 @@ protected Statement bind(Statement to) {
 			return to;
 		}
 
-
 		@Override
 		public Statement createBoundStatement(Connection connection) {
 
 			// TODO add back logging
-//			if (logger.isDebugEnabled()) {
-//				logger.debug("Executing SQL statement [" + sql + "]");
-//			}
+			// if (logger.isDebugEnabled()) {
+			// logger.debug("Executing SQL statement [" + sql + "]");
+			// }
 
 			return bind(connection.createStatement(toQuery()));
 		}
@@ -467,7 +485,7 @@ public void addSqlFilter(Function<String, String> filter) {
 		}
 
 		@Override
-		public void addBindingFilter(Function<Binding, Binding> filter) {
+		public void addBindingFilter(Function<Bindings, Bindings> filter) {
 
 			Assert.notNull(filter, "Filter must not be null.");
 
@@ -476,7 +494,6 @@ public void addBindingFilter(Function<Binding, Binding> filter) {
 
 	}
 
-
 	/**
 	 * Default implementation of {@link PreparedOperation}.
 	 *
@@ -487,7 +504,7 @@ static class DefaultPreparedOperation<T> extends PreparedOperationSupport<T> {
 
 		private final T source;
 		private final RenderContext renderContext;
-		private final Binding binding;
+		private final Bindings bindings;
 
 		/*
 		 * (non-Javadoc)
@@ -522,8 +539,8 @@ protected String createBaseSql() {
 		}
 
 		@Override
-		protected Binding getBaseBinding() {
-			return binding;
+		protected Bindings getBaseBinding() {
+			return bindings;
 		}
 	}
 }

src/main/java/org/springframework/data/r2dbc/function/ParameterbindingPreparedOperation.java

@@ -73,7 +73,7 @@ public void addSqlFilter(Function<String, String> filter) {
 	}
 
 	@Override
-	public void addBindingFilter(Function<DefaultStatementFactory.Binding, DefaultStatementFactory.Binding> filter) {
+	public void addBindingFilter(Function<Bindings, Bindings> filter) {
 
 	}
 

src/main/java/org/springframework/data/r2dbc/function/PreparedOperation.java

@@ -51,5 +51,5 @@ public interface PreparedOperation<T> extends QueryOperation {
 
 	void addSqlFilter(Function<String, String> filter);
 
-	void addBindingFilter(Function<DefaultStatementFactory.Binding, DefaultStatementFactory.Binding> filter);
+	void addBindingFilter(Function<Bindings, Bindings> filter);
 }