#57 - hacking - minor code improvements.

Author: schauder

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

@@ -337,45 +337,9 @@ <T> FetchSpec<T> exchange(String sql, BiFunction<Row, RowMetadata, T> mappingFun
 			if (sqlSupplier instanceof PreparedOperation<?>) {
 				pop = ((PreparedOperation<?>) sqlSupplier);
 			} else {
-				pop = new PrameterbindingPreparedOperation(namedParameters.expand(sql, dataAccessStrategy.getBindMarkersFactory(),
-						new MapBindParameterSource(byName)), byName, byIndex);
+				pop = new ParameterbindingPreparedOperation(sql, namedParameters, dataAccessStrategy, byName, byIndex);
 			}
 
-
-
-			Function<Connection, Statement> executeFunction = it -> {
-
-				if (logger.isDebugEnabled()) {
-					logger.debug("Executing SQL statement [" + sql + "]");
-				}
-
-				if (sqlSupplier instanceof PreparedOperation<?>) {
-					return ((PreparedOperation<?>) sqlSupplier).bind(it.createStatement(sql));
-				}
-
-				BindableOperation operation = namedParameters.expand(sql, dataAccessStrategy.getBindMarkersFactory(),
-						new MapBindParameterSource(byName));
-
-				if (logger.isTraceEnabled()) {
-					logger.trace("Expanded SQL [" + operation.toQuery() + "]");
-				}
-
-				Statement statement = it.createStatement(operation.toQuery());
-
-				byName.forEach((name, o) -> {
-
-					if (o.getValue() != null) {
-						operation.bind(statement, name, o.getValue());
-					} else {
-						operation.bindNull(statement, name, o.getType());
-					}
-				});
-
-				bindByIndex(statement, byIndex);
-
-				return statement;
-			};
-
 			Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(pop.bind(it).execute());
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //

src/main/java/org/springframework/data/r2dbc/function/PrameterbindingPreparedOperation.java renamed to src/main/java/org/springframework/data/r2dbc/function/ParameterbindingPreparedOperation.java

@@ -17,34 +17,47 @@
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Statement;
-import org.springframework.data.r2dbc.domain.SettableValue;
 
 import java.util.Map;
 
+import org.springframework.data.r2dbc.domain.SettableValue;
+
 /**
  * @author Jens Schauder
  */
-public class PrameterbindingPreparedOperation implements PreparedOperation<BindableOperation> {
+public class ParameterbindingPreparedOperation implements PreparedOperation<BindableOperation> {
 
 	private final BindableOperation operation;
 	private final Map<String, SettableValue> byName;
 	private final Map<Integer, SettableValue> byIndex;
 
-	public PrameterbindingPreparedOperation(BindableOperation operation, Map<String, SettableValue> byName, Map<Integer, SettableValue> byIndex) {
+	private ParameterbindingPreparedOperation(BindableOperation operation, Map<String, SettableValue> byName,
+			Map<Integer, SettableValue> byIndex) {
 
 		this.operation = operation;
 		this.byName = byName;
 		this.byIndex = byIndex;
 	}
 
+	ParameterbindingPreparedOperation(String sql, NamedParameterExpander namedParameters,
+			ReactiveDataAccessStrategy dataAccessStrategy, Map<String, SettableValue> byName,
+			Map<Integer, SettableValue> byIndex) {
+
+		this( //
+				namedParameters.expand(sql, dataAccessStrategy.getBindMarkersFactory(), new MapBindParameterSource(byName)), //
+				byName, //
+				byIndex //
+		);
+	}
+
 	@Override
 	public BindableOperation getSource() {
 		return operation;
 	}
 
 	@Override
 	public Statement bind(Statement to) {
-		return null;
+		throw new UnsupportedOperationException("we don't do that here");
 	}
 
 	@Override
@@ -63,15 +76,14 @@ public Statement bind(Connection connection) {
 
 		bindByIndex(statement, byIndex);
 
-		return statement;	}
+		return statement;
+	}
 
 	@Override
 	public String toQuery() {
-		return null;
+		return operation.toQuery();
 	}
 
-
-
 	private static void bindByName(Statement statement, Map<String, SettableValue> byName) {
 
 		byName.forEach((name, o) -> {