Merge pull request #59 from oracle/0-9-0-update

0.9.0 SPI Update

Author: jeandelavarene

pom.xml

@@ -26,10 +26,10 @@
 
   <groupId>com.oracle.database.r2dbc</groupId>
   <artifactId>oracle-r2dbc</artifactId>
-  <version>0.3.0</version>
+  <version>0.4.0</version>
   <name>oracle-r2dbc</name>
   <description>
-    Oracle R2DBC Driver implementing version 0.9.0.M2 of the R2DBC SPI for Oracle Database.
+    Oracle R2DBC Driver implementing version 0.9.0 of the R2DBC SPI for Oracle Database.
   </description>
   <url>
     https://github.com/oracle/oracle-r2dbc
@@ -66,7 +66,7 @@
   <properties>
     <java.version>11</java.version>
     <ojdbc.version>21.3.0.0</ojdbc.version>
-    <r2dbc.version>0.9.0.RC1</r2dbc.version>
+    <r2dbc.version>0.9.0.RELEASE</r2dbc.version>
     <reactor.version>3.3.0.RELEASE</reactor.version>
     <reactive-streams.version>1.0.3</reactive-streams.version>
     <junit.version>5.7.0</junit.version>

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

@@ -952,8 +952,7 @@ private JdbcStatement(PreparedStatement preparedStatement, Object[] binds) {
      * @return A publisher that emits the result of executing this statement
      */
     final Publisher<OracleResultImpl> execute() {
-
-      if(true)return Flux.usingWhen(Mono.just(new ArrayList<>(1)),
+      return Flux.usingWhen(Mono.just(new ArrayList<>(1)),
         results ->
           Mono.from(bind())
             .thenMany(executeJdbc())
@@ -962,22 +961,6 @@ final Publisher<OracleResultImpl> execute() {
             .onErrorResume(R2dbcException.class, r2dbcException ->
               Mono.just(createErrorResult(r2dbcException))),
         this::deallocate);
-
-      List<OracleResultImpl> results = new ArrayList<>(1);
-      Publisher<OracleResultImpl> deallocate =
-        Mono.defer(() -> Mono.from(deallocate(results)))
-          .cast(OracleResultImpl.class);
-
-      return Flux.concatDelayError(
-        Mono.from(bind())
-          .thenMany(executeJdbc())
-          .map(this::getWarnings)
-          .doOnNext(results::add)
-          .onErrorResume(R2dbcException.class, r2dbcException ->
-            Mono.just(createErrorResult(r2dbcException))),
-        deallocate)
-        .doOnCancel(() ->
-          Mono.from(deallocate).subscribe());
     }
 
     /**

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

@@ -534,6 +534,14 @@ Publisher<Void> publishClobWrite(
    */
   Publisher<Void> publishClobFree(Clob clob) throws R2dbcException;
 
+  /**
+   * Returns the {@link AsyncLock} that guards access to the JDBC
+   * {@link java.sql.Connection} created by this adapter (with
+   * {@link #publishConnection(DataSource, Executor)}). This lock may be
+   * acquired asynchronously, such that threads do not contend for the JDBC
+   * connection or any object created by that connection.
+   * @return Lock that guards access to the JDBC connection of this adapter.
+   */
   AsyncLock getLock();
 
   /** 

src/test/java/oracle/r2dbc/test/OracleTestKit.java

@@ -149,12 +149,14 @@ public String doGetSql(TestStatement statement) {
           " FROM test_two_column";
       case SELECT_VALUE:
         // Use ORDER BY to return rows in a consistent order
-        return "SELECT value FROM test ORDER BY value";
+        return "SELECT test_value FROM test ORDER BY test_value";
       case CREATE_TABLE_AUTOGENERATED_KEY:
+        // For Oracle SQL, need to declare "GENERATED ALWAYS AS"
         return "CREATE TABLE test (" +
-          "id NUMBER GENERATED ALWAYS AS IDENTITY, value NUMBER)";
+          "id NUMBER GENERATED ALWAYS AS IDENTITY, test_value NUMBER)";
       case INSERT_VALUE_AUTOGENERATED_KEY:
-        return "INSERT INTO test(value) VALUES(100)";
+        // For Oracle SQL, the column name must be specified: test(test_value)
+        return "INSERT INTO test(test_value) VALUES(100)";
       default:
         return statement.getSql();
     }
@@ -183,7 +185,7 @@ public String doGetSql(TestStatement statement) {
    */
   @Override
   public Object extractColumn(Row row) {
-    return extractColumn("value", row);
+    return extractColumn("test_value", row);
   }
 
   /**
@@ -253,7 +255,8 @@ public void duplicateColumnNames() {
 
         .flatMap(result -> result
           .map((row, rowMetadata) -> Arrays.asList(
-            extractColumn("value", row), extractColumn("VALUE", row))))
+            extractColumn("test_value", row),
+            extractColumn("TEST_VALUE", row))))
         .flatMapIterable(Function.identity())
 
         .concatWith(close(connection)))