#73 - hacking - removed old bind method from interface.

Author: schauder

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

@@ -465,8 +465,7 @@ public String toQuery() {
 		 * (non-Javadoc)
 		 * @see org.springframework.data.r2dbc.function.PreparedOperation#bind(io.r2dbc.spi.Statement)
 		 */
-		@Override
-		public Statement bind(Statement to) {
+		protected Statement bind(Statement to) {
 
 			binding.apply(to);
 			return to;
@@ -480,12 +479,7 @@ public Statement bind(Connection connection) {
 //				logger.debug("Executing SQL statement [" + sql + "]");
 //			}
 
-			Statement statement = connection.createStatement(toQuery());
-
-			// TODO there is too much binding going on.
-			// this looks silly and is by no means easy to understand (i.e. I don't)
-			binding.apply(statement);
-			return bind(statement);
+			return bind(connection.createStatement(toQuery()));
 		}
 	}
 }

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

@@ -55,11 +55,6 @@ public BindableOperation getSource() {
 		return operation;
 	}
 
-	@Override
-	public Statement bind(Statement to) {
-		throw new UnsupportedOperationException("we don't do that here");
-	}
-
 	@Override
 	public Statement bind(Connection connection) {
 

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

@@ -42,11 +42,8 @@ public interface PreparedOperation<T> extends QueryOperation {
 	/**
 	 * Bind query parameters to a {@link Statement}.
 	 *
-	 * @param to the target statement to bind parameters to.
+	 * @param connection the {@link Connection} used for constructing a statement
 	 * @return the bound statement.
 	 */
-	@Deprecated
-	Statement bind(Statement to);
-
 	Statement bind(Connection connection);
 }

src/test/java/org/springframework/data/r2dbc/function/StatementFactoryUnitTests.java

@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Statement;
 
 import java.util.Arrays;
@@ -46,6 +47,11 @@ public class StatementFactoryUnitTests {
 					.createRenderContext());
 
 	Statement statementMock = mock(Statement.class);
+	Connection connectionMock = mock(Connection.class);
+
+	{
+		when(connectionMock.createStatement(anyString())).thenReturn(statementMock);
+	}
 
 	@Test
 	public void shouldToQuerySimpleSelectWithoutBindings() {
@@ -55,7 +61,8 @@ public void shouldToQuerySimpleSelectWithoutBindings() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo");
 
-		select.bind(statementMock);
+		select.bind(connectionMock);
+
 		verifyZeroInteractions(statementMock);
 	}
 
@@ -69,7 +76,8 @@ public void shouldToQuerySimpleSelectWithSimpleFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe = $1");
 
-		select.bind(statementMock);
+		select.bind(connectionMock);
+
 		verify(statementMock).bind(0, "John");
 		verifyNoMoreInteractions(statementMock);
 	}
@@ -85,7 +93,8 @@ public void shouldToQuerySimpleSelectWithMultipleFilters() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe = $1 AND foo.baz = $2");
 
-		select.bind(statementMock);
+		select.bind(connectionMock);
+
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
 		verifyNoMoreInteractions(statementMock);
@@ -101,7 +110,7 @@ public void shouldToQuerySimpleSelectWithNullFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe IS NULL");
 
-		select.bind(statementMock);
+		select.bind(connectionMock);
 		verifyZeroInteractions(statementMock);
 	}
 
@@ -115,7 +124,7 @@ public void shouldToQuerySimpleSelectWithIterableFilter() {
 		assertThat(select.getSource()).isInstanceOf(Select.class);
 		assertThat(select.toQuery()).isEqualTo("SELECT foo.bar, foo.baz FROM foo WHERE foo.doe IN ($1, $2)");
 
-		select.bind(statementMock);
+		select.bind(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
 		verifyNoMoreInteractions(statementMock);
@@ -138,7 +147,7 @@ public void shouldToQuerySimpleInsert() {
 		assertThat(insert.getSource()).isInstanceOf(Insert.class);
 		assertThat(insert.toQuery()).isEqualTo("INSERT INTO foo (bar) VALUES ($1)");
 
-		insert.bind(statementMock);
+		insert.bind(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verify(statementMock).returnGeneratedValues(any(String[].class));
 		verifyNoMoreInteractions(statementMock);
@@ -161,7 +170,7 @@ public void shouldToQuerySimpleUpdate() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1");
 
-		update.bind(statementMock);
+		update.bind(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verifyNoMoreInteractions(statementMock);
 	}
@@ -176,7 +185,7 @@ public void shouldToQueryNullUpdate() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1");
 
-		update.bind(statementMock);
+		update.bind(connectionMock);
 		verify(statementMock).bindNull(0, String.class);
 
 		verifyNoMoreInteractions(statementMock);
@@ -193,7 +202,7 @@ public void shouldToQueryUpdateWithFilter() {
 		assertThat(update.getSource()).isInstanceOf(Update.class);
 		assertThat(update.toQuery()).isEqualTo("UPDATE foo SET bar = $1 WHERE foo.baz = $2");
 
-		update.bind(statementMock);
+		update.bind(connectionMock);
 		verify(statementMock).bind(0, "Foo");
 		verify(statementMock).bind(1, "Baz");
 		verifyNoMoreInteractions(statementMock);
@@ -209,7 +218,7 @@ public void shouldToQuerySimpleDeleteWithSimpleFilter() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe = $1");
 
-		delete.bind(statementMock);
+		delete.bind(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verifyNoMoreInteractions(statementMock);
 	}
@@ -225,7 +234,7 @@ public void shouldToQuerySimpleDeleteWithMultipleFilters() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe = $1 AND foo.baz = $2");
 
-		delete.bind(statementMock);
+		delete.bind(connectionMock);
 		verify(statementMock).bind(0, "John");
 		verify(statementMock).bind(1, "Jake");
 		verifyNoMoreInteractions(statementMock);
@@ -241,7 +250,7 @@ public void shouldToQuerySimpleDeleteWithNullFilter() {
 		assertThat(delete.getSource()).isInstanceOf(Delete.class);
 		assertThat(delete.toQuery()).isEqualTo("DELETE FROM foo WHERE foo.doe IS NULL");
 
-		delete.bind(statementMock);
+		delete.bind(connectionMock);
 		verifyZeroInteractions(statementMock);
 	}
 }