Merge pull request #14 from oracle/11_non_empty_update_count

11 Result.getRowsUpdated() Emits 0

Author: jeandelavarene

src/main/java/oracle/r2dbc/impl/OracleResultImpl.java

@@ -68,17 +68,21 @@ private OracleResultImpl() { }
 
   /**
    * Creates a {@code Result} that publishes either an empty stream of row
-   * data, or publishes an {@code updateCount} if it is greater than zero. An
-   * {@code updateCount} less than 1 is published as an empty stream.
+   * data, or publishes an {@code updateCount} if it is greater than or equal
+   * to zero. An {@code updateCount} less than zero is published as an empty
+   * stream.
    * @param updateCount Update count to publish
    * @return An update count {@code Result}
    */
   public static Result createUpdateCountResult(int updateCount) {
     return new OracleResultImpl() {
 
+      final Publisher<Integer> updateCountPublisher =
+        updateCount < 0 ? Mono.empty() : Mono.just(updateCount);
+
       @Override
       Publisher<Integer> publishUpdateCount() {
-        return updateCount < 1 ? Mono.empty() : Mono.just(updateCount);
+        return updateCountPublisher;
       }
 
       @Override

src/test/java/oracle/r2dbc/impl/OracleResultImplTest.java

@@ -98,21 +98,21 @@ public void testGetRowsUpdated() {
         // Expect update count publisher to support multiple subscribers
         awaitOne(1, insertCountPublisher1);
 
-        // Expect no update count from UPDATE of zero rows
+        // Expect an update count of zero from UPDATE of zero rows
         Result noUpdateResult = awaitOne(connection.createStatement(
           "UPDATE testGetRowsUpdated SET y = 99 WHERE x = 99")
           .execute());
         Publisher<Integer> noUpdateCountPublisher =
           noUpdateResult.getRowsUpdated();
-        awaitNone(noUpdateCountPublisher);
+        awaitOne(0, noUpdateCountPublisher);
 
         // Expect IllegalStateException from multiple Result consumptions.
         assertThrows(IllegalStateException.class,
           () -> noUpdateResult.map((row, metadata) -> "unexpected"));
         assertThrows(IllegalStateException.class, noUpdateResult::getRowsUpdated);
 
         // Expect update count publisher to support multiple subscribers
-        awaitNone(noUpdateCountPublisher);
+        awaitOne(0, noUpdateCountPublisher);
 
         // Expect update count of 2 from UPDATE of 2 rows
         Result updateResult = awaitOne(connection.createStatement(

src/test/java/oracle/r2dbc/impl/OracleStatementImplTest.java

@@ -811,11 +811,9 @@ public void testExecute() {
     Connection connection =
       Mono.from(sharedConnection()).block(connectTimeout());
     try {
-      // Expect DDL to result in no update count
-      awaitUpdate(
-        Collections.emptyList(),
-        connection.createStatement(
-          "CREATE TABLE testExecute (x NUMBER)"));
+      // Expect DDL to result in an update count of zero
+      awaitUpdate(0, connection.createStatement(
+        "CREATE TABLE testExecute (x NUMBER)"));
       // Expect DDL to result in no row data
       awaitQuery(
         Collections.emptyList(),

src/test/java/oracle/r2dbc/util/Awaits.java

@@ -132,16 +132,12 @@ public static <T> List<T> awaitMany(Publisher<T> multiPublisher) {
   /**
    * Executes a {@code statement} and blocks until the execution
    * completes. This method verifies that the execution produces a
-   * {@link Result} with no count of updated rows.
-   * @param statement A statement that does not update rows.
+   * {@link Result} with a count of zero updated rows.
+   * @param statement A statement that does updates zero rows.
    * @throws Throwable If the statement execution results in an error.
    */
   public static void awaitExecution(Statement statement) {
-    assertNull(
-      Mono.from(statement.execute())
-        .flatMap(result -> Mono.from(result.getRowsUpdated()))
-        .block(sqlTimeout()),
-      "Expected no update count when not updating rows");
+    awaitUpdate(0, statement);
   }
 
   /**