Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#10 - Adapt to removed Statement.executeReturningGeneratedKeys().

Browse Source
This commit is contained in:
Mark Paluch
2018-11-12 14:56:41 +01:00
parent 07811a40f5
commit c2ebfb8cd3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -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>

8
src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java
View File

@@ -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, //