Add OracleColumnDesc that implements ColumnDesc

Author: vietj

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

@@ -0,0 +1,64 @@
+/*
+ * 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.impl;
+
+import io.vertx.sqlclient.desc.ColumnDescriptor;
+import io.vertx.sqlclient.impl.RowDesc;
+
+import java.sql.JDBCType;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class OracleColumnDesc implements ColumnDescriptor {
+
+  public static RowDesc rowDesc(ResultSetMetaData metaData) throws SQLException {
+    int cols = metaData.getColumnCount();
+    List<String> columnNames = new ArrayList<>(cols);
+    List<ColumnDescriptor> columnDescriptors = new ArrayList<>(cols);
+    for (int i = 1; i <= cols; i++) {
+      columnNames.add(metaData.getColumnLabel(i));
+      columnDescriptors.add(new OracleColumnDesc(metaData, i));
+    }
+    return new RowDesc(columnNames, columnDescriptors);
+  }
+
+  private final String name;
+  private final String typeName;
+  private final JDBCType type;
+
+  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));
+  }
+
+  @Override
+  public String name() {
+    return name;
+  }
+
+  @Override
+  public boolean isArray() {
+    return false;
+  }
+
+  @Override
+  public String typeName() {
+    return typeName;
+  }
+
+  @Override
+  public JDBCType jdbcType() {
+    return type;
+  }
+}

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

@@ -15,11 +15,13 @@
 import io.vertx.core.impl.ContextInternal;
 import io.vertx.oracleclient.OracleConnectOptions;
 import io.vertx.oracleclient.impl.Helper;
+import io.vertx.oracleclient.impl.OracleColumnDesc;
 import io.vertx.oracleclient.impl.OracleRow;
 import io.vertx.oracleclient.impl.RowReader;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowSet;
 import io.vertx.sqlclient.Tuple;
+import io.vertx.sqlclient.desc.ColumnDescriptor;
 import io.vertx.sqlclient.impl.QueryResultHandler;
 import io.vertx.sqlclient.impl.RowDesc;
 import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
@@ -77,8 +79,7 @@ public Future<RowReader> createRowReader(PreparedStatement sqlStatement, Context
       return Helper.first(publisher, context)
         .compose(ors -> {
           try {
-            RowDesc description = createDescription(ors);
-
+            RowDesc description = OracleColumnDesc.rowDesc(ors.getMetaData());
             List<String> types = new ArrayList<>();
             for (int i = 1; i <= ors.getMetaData().getColumnCount(); i++) {
               types.add(ors.getMetaData().getColumnClassName(i));
@@ -96,17 +97,6 @@ public Future<RowReader> createRowReader(PreparedStatement sqlStatement, Context
     }
   }
 
-  private static RowDesc createDescription(OracleResultSet ors) throws SQLException {
-    List<String> columnNames = new ArrayList<>();
-    RowDesc desc = new RowDesc(columnNames);
-    ResultSetMetaData metaData = ors.getMetaData();
-    int cols = metaData.getColumnCount();
-    for (int i = 1; i <= cols; i++) {
-      columnNames.add(metaData.getColumnLabel(i));
-    }
-    return desc;
-  }
-
   private static Row transform(List<String> ors, RowDesc desc, oracle.jdbc.OracleRow or) throws SQLException {
     Row row = new OracleRow(desc);
     for (int i = 1; i <= desc.columnNames().size(); i++) {

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

@@ -10,14 +10,13 @@
  */
 package io.vertx.oracleclient.impl.commands;
 
+import io.vertx.oracleclient.impl.OracleColumnDesc;
 import io.vertx.sqlclient.impl.ParamDesc;
 import io.vertx.sqlclient.impl.RowDesc;
 import io.vertx.sqlclient.impl.TupleInternal;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class OraclePreparedStatement implements io.vertx.sqlclient.impl.PreparedStatement {
 
@@ -26,19 +25,15 @@ public class OraclePreparedStatement implements io.vertx.sqlclient.impl.Prepared
   private final ParamDesc paramDesc;
 
   public OraclePreparedStatement(String sql, java.sql.PreparedStatement preparedStatement) throws SQLException {
-
-    List<String> columnNames = new ArrayList<>();
     ResultSetMetaData metaData = preparedStatement.getMetaData();
+    RowDesc rowDesc;
     if (metaData != null) {
-      // Not a SELECT
-      int cols = metaData.getColumnCount();
-      for (int i = 1; i <= cols; i++) {
-        columnNames.add(metaData.getColumnLabel(i));
-      }
+      rowDesc = OracleColumnDesc.rowDesc(metaData);
+    } else {
+      rowDesc = RowDesc.EMPTY;
     }
-
     this.sql = sql;
-    this.rowDesc = new RowDesc(columnNames);
+    this.rowDesc = rowDesc;
     this.paramDesc = new ParamDesc();
   }
 

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDesc.java

@@ -20,6 +20,7 @@
 import io.vertx.sqlclient.desc.ColumnDescriptor;
 
 import java.sql.JDBCType;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,6 +30,8 @@
 
 public class RowDesc {
 
+  public static final RowDesc EMPTY = new RowDesc(Collections.emptyList(), Collections.emptyList());
+
   private final List<String> columnNames;
   private final List<ColumnDescriptor> columnDescriptors;