From 94c8f751a724c51071c4fd6ad6862d5b8a86fb94 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 23 Oct 2019 14:00:01 +0200 Subject: [PATCH] #212 - Polishing. Consistently apply summing of updated rows. Tweak copyright years in license header to reflect file inception year. Original pull request: #213. --- .../springframework/data/r2dbc/core/DefaultDatabaseClient.java | 2 +- .../org/springframework/data/r2dbc/core/DefaultSqlResult.java | 2 +- .../data/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt | 2 +- .../data/r2dbc/core/UpdatedRowsFetchSpecExtensionsTests.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java index 0e87081..de3081e 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -391,7 +391,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { return new DefaultSqlResult<>(DefaultDatabaseClient.this, // sql, // resultFunction, // - it -> resultFunction.apply(it).flatMap(Result::getRowsUpdated).next(), // + it -> sumRowsUpdated(resultFunction, it), // mappingFunction); } diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java index bf31892..aa75ba4 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java @@ -56,7 +56,7 @@ class DefaultSqlResult implements SqlResult { @Override public Mono rowsUpdated() { - return Mono.empty(); + return Mono.just(0); } }; diff --git a/src/main/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt b/src/main/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt index b2dba05..a63c0b9 100644 --- a/src/main/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt +++ b/src/main/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensionsTests.kt b/src/test/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensionsTests.kt index 3e1dda7..85c7683 100644 --- a/src/test/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensionsTests.kt +++ b/src/test/kotlin/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpecExtensionsTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.