SqlResult columnDescriptor is always empty for Oracle (#1069)

Fixes #1068

The client must create RowDesc from ResultSet metadata (when possible).

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleColumnDesc.java

@@ -39,7 +39,16 @@ public static RowDesc rowDesc(ResultSetMetaData metaData) throws SQLException {
   public OracleColumnDesc(ResultSetMetaData md, int idx) throws SQLException {
     this.name = md.getColumnLabel(idx);
     this.typeName = md.getColumnTypeName(idx);
-    this.type = JDBCType.valueOf(md.getColumnType(idx));
+    this.type = find(md.getColumnType(idx));
+  }
+
+  private static JDBCType find(int vendorTypeNumber) {
+    for (JDBCType jdbcType : JDBCType.values()) {
+      if (jdbcType.getVendorTypeNumber() == vendorTypeNumber) {
+        return jdbcType;
+      }
+    }
+    return JDBCType.OTHER;
   }
 
   @Override
@@ -49,7 +58,7 @@ public String name() {
 
   @Override
   public boolean isArray() {
-    return false;
+    return type == JDBCType.ARRAY;
   }
 
   @Override

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/QueryCommand.java

@@ -15,8 +15,8 @@
 import io.vertx.core.json.JsonArray;
 import io.vertx.oracleclient.OracleConnectOptions;
 import io.vertx.oracleclient.OraclePrepareOptions;
+import io.vertx.oracleclient.impl.OracleColumnDesc;
 import io.vertx.oracleclient.impl.OracleRow;
-import io.vertx.sqlclient.PrepareOptions;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.impl.RowDesc;
@@ -25,9 +25,6 @@
 import java.math.BigDecimal;
 import java.sql.*;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.stream.Collector;
 
@@ -102,7 +99,7 @@ protected OracleResponse<R> decode(Statement statement, int[] returnedBatchResul
 
     BiConsumer<C, Row> accumulator = collector.accumulator();
 
-    RowDesc desc = new RowDesc(Collections.emptyList());
+    RowDesc desc = RowDesc.EMPTY;
     C container = collector.supplier().get();
     for (int result : returnedBatchResult) {
       Row row = new OracleRow(desc);
@@ -123,19 +120,14 @@ protected OracleResponse<R> decode(Statement statement, int[] returnedBatchResul
   private void decodeResultSet(ResultSet rs, OracleResponse<R> response) throws SQLException {
     BiConsumer<C, Row> accumulator = collector.accumulator();
 
-    List<String> columnNames = new ArrayList<>();
-    RowDesc desc = new RowDesc(columnNames);
     C container = collector.supplier().get();
     int size = 0;
     ResultSetMetaData metaData = rs.getMetaData();
-    int cols = metaData.getColumnCount();
-    for (int i = 1; i <= cols; i++) {
-      columnNames.add(metaData.getColumnLabel(i));
-    }
+    RowDesc desc = OracleColumnDesc.rowDesc(metaData);
     while (rs.next()) {
       size++;
       Row row = new OracleRow(desc);
-      for (int i = 1; i <= cols; i++) {
+      for (int i = 1; i <= metaData.getColumnCount(); i++) {
         Object res = convertSqlValue(rs.getObject(i));
         row.addValue(res);
       }
@@ -146,30 +138,6 @@ private void decodeResultSet(ResultSet rs, OracleResponse<R> response) throws SQ
       .push(collector.finisher().apply(container), desc, size);
   }
 
-  private R decodeRawResultSet(ResultSet rs) throws SQLException {
-    BiConsumer<C, Row> accumulator = collector.accumulator();
-
-    List<String> columnNames = new ArrayList<>();
-    RowDesc desc = new RowDesc(columnNames);
-    C container = collector.supplier().get();
-
-    ResultSetMetaData metaData = rs.getMetaData();
-    int cols = metaData.getColumnCount();
-    for (int i = 1; i <= cols; i++) {
-      columnNames.add(metaData.getColumnLabel(i));
-    }
-    while (rs.next()) {
-      Row row = new OracleRow(desc);
-      for (int i = 1; i <= cols; i++) {
-        Object res = convertSqlValue(rs.getObject(i));
-        row.addValue(res);
-      }
-      accumulator.accept(container, row);
-    }
-
-    return collector.finisher().apply(container);
-  }
-
   private void decodeReturnedKeys(Statement statement, OracleResponse<R> response) throws SQLException {
     Row keys = null;
 
@@ -180,11 +148,7 @@ private void decodeReturnedKeys(Statement statement, OracleResponse<R> response)
       if (metaData != null) {
         int cols = metaData.getColumnCount();
         if (cols > 0) {
-          List<String> keysColumnNames = new ArrayList<>();
-          RowDesc keysDesc = new RowDesc(keysColumnNames);
-          for (int i = 1; i <= cols; i++) {
-            keysColumnNames.add(metaData.getColumnLabel(i));
-          }
+          RowDesc keysDesc = OracleColumnDesc.rowDesc(metaData);
 
           if (keysRS.next()) {
             keys = new OracleRow(keysDesc);

vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OracleColumnDescriptorTest.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011-2021 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
+
+package io.vertx.oracleclient.test;
+
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.oracleclient.OraclePool;
+import io.vertx.oracleclient.test.junit.OracleRule;
+import io.vertx.sqlclient.PoolOptions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class OracleColumnDescriptorTest extends OracleTestBase {
+
+  @ClassRule
+  public static OracleRule oracle = OracleRule.SHARED_INSTANCE;
+
+  OraclePool pool;
+
+  @Before
+  public void setUp() throws Exception {
+    pool = OraclePool.pool(vertx, oracle.options(), new PoolOptions());
+  }
+
+  @Test
+  public void testMetadata(TestContext ctx) {
+    pool.withConnection(conn -> conn.query("SELECT id, val FROM mutable").execute(), ctx.asyncAssertSuccess(rows -> {
+      ctx.assertNotNull(rows.columnDescriptors());
+      ctx.assertNotNull(rows.columnsNames());
+      ctx.assertEquals("ID", rows.columnsNames().get(0));
+      ctx.assertEquals("VAL", rows.columnsNames().get(1));
+      ctx.assertEquals(2, rows.columnDescriptors().size());
+      ctx.assertEquals("NUMBER", rows.columnDescriptors().get(0).typeName());
+      ctx.assertEquals("VARCHAR2", rows.columnDescriptors().get(1).typeName());
+    }));
+  }
+
+  @After
+  public void tearDown(TestContext ctx) throws Exception {
+    pool.close(ctx.asyncAssertSuccess());
+  }
+}