#73 - hacking - proper expanded single binding.

Author: schauder

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

@@ -94,46 +94,28 @@ public boolean isIndexed() {
 
 	public static class NamedExpandedSingleBinding<T> extends SingleBinding<T>{
 
-		public NamedExpandedSingleBinding(T identifier, SettableValue value) {
-			super(identifier, value);
-		}
-
-		@Override
-		public void bindTo(Statement statement) {
-
-			if (getValue().isEmpty()) {
-				statement.bindNull(getIdentifier(), getValue().getType());
-			}
-
-			statement.bind(getIdentifier(), getValue());
-		}
-
-		@Override
-		public boolean isIndexed() {
-			return false;
-		}
-	}
+		private final BindableOperation operation;
 
-	public static class IndexedExpandedSingleBinding extends SingleBinding<Integer>{
+		public NamedExpandedSingleBinding(T identifier, SettableValue value, BindableOperation operation) {
 
-		public IndexedExpandedSingleBinding(Integer identifier, SettableValue value) {
 			super(identifier, value);
+
+			this.operation = operation;
 		}
 
 		@Override
 		public void bindTo(Statement statement) {
 
-			if (getValue().isEmpty()) {
-				statement.bindNull((int)getIdentifier(), getValue().getType());
+			if (getValue() != null) {
+				operation.bind(statement,getIdentifier(), getValue());
+			} else {
+				operation.bindNull(statement, getIdentifier(), getValue().getType());
 			}
-
-			statement.bind((int)getIdentifier(), getValue());
 		}
+
 		@Override
 		public boolean isIndexed() {
-			return true;
+			return false;
 		}
 	}
-
-
 }