From c2ebfb8cd3522bc46b6cc7f1f6ab9b90763f46a0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 12 Nov 2018 14:56:41 +0100
Subject: [PATCH] #10 - Adapt to removed
 Statement.executeReturningGeneratedKeys().

---
 pom.xml                                                   | 4 ++--
 .../data/r2dbc/function/DefaultDatabaseClient.java        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73ed136..bc625c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
 		<degraph-check.version>0.1.4</degraph-check.version>
 		<hsqldb.version>2.2.8</hsqldb.version>
 		<postgresql.version>42.0.0</postgresql.version>
-		<r2dbc-spi.version>1.0.0.M5</r2dbc-spi.version>
-		<r2dbc-postgresql.version>1.0.0.M5</r2dbc-postgresql.version>
+		<r2dbc-spi.version>1.0.0.BUILD-SNAPSHOT</r2dbc-spi.version>
+		<r2dbc-postgresql.version>1.0.0.BUILD-SNAPSHOT</r2dbc-postgresql.version>
 		<testcontainers.version>1.7.3</testcontainers.version>
 
 	</properties>
diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java
index 18503ad..3aa0881 100644
--- a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java
+++ b/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java
@@ -867,7 +867,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
 					.collect(Collectors.joining(","));
 
 			builder.append("INSERT INTO ").append(table).append(" (").append(fieldNames).append(") ").append(" VALUES(")
-					.append(placeholders).append(")");
+					.append(placeholders).append(") RETURNING *");
 
 			String sql = builder.toString();
 			Function<Connection, Statement> insertFunction = it -> {
@@ -881,7 +881,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
 			};
 
 			Function<Connection, Flux<Result>> resultFunction = it -> Flux
-					.from(insertFunction.apply(it).executeReturningGeneratedKeys());
+					.from(insertFunction.apply(it).execute());
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
 					sql, //
@@ -972,7 +972,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
 					.collect(Collectors.joining(","));
 
 			builder.append("INSERT INTO ").append(table).append(" (").append(fieldNames).append(") ").append(" VALUES(")
-					.append(placeholders).append(")");
+					.append(placeholders).append(") RETURNING *");
 
 			String sql = builder.toString();
 
@@ -999,7 +999,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
 			};
 
 			Function<Connection, Flux<Result>> resultFunction = it -> {
-				return Flux.from(insertFunction.apply(it).executeReturningGeneratedKeys());
+				return Flux.from(insertFunction.apply(it).execute());
 			};
 
 			return new DefaultSqlResult<>(DefaultDatabaseClient.this, //