Merge pull request #185 from looker-open-source/goomrw-get-by-label

Fix `findColumn` and `get*(String label)` methods.

src/main/java/net/starschema/clouddb/jdbc/BQForwardOnlyResultSet.java

@@ -61,7 +61,12 @@
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -581,28 +586,10 @@ public void deleteRow() throws SQLException {
     throw new BQSQLFeatureNotSupportedException("deleteRow()");
   }
 
-  /**
-   *
-   *
-   * <h1>Implementation Details:</h1>
-   *
-   * <br>
-   * Not implemented yet.
-   *
-   * @throws BQSQLException
-   */
+  /** {@inheritDoc} */
   @Override
   public int findColumn(String columnLabel) throws SQLException {
-    if (this.isClosed()) {
-      throw new BQSQLException("This Resultset is Closed");
-    }
-    int columncount = this.getMetaData().getColumnCount();
-    for (int i = 1; i <= columncount; i++) {
-      if (this.getMetaData().getCatalogName(i).equals(columnLabel)) {
-        return i;
-      }
-    }
-    throw new BQSQLException("No Such column labeled: " + columnLabel);
+    return CommonResultSet.findColumn(columnLabel, getMetaData());
   }
 
   /**

src/main/java/net/starschema/clouddb/jdbc/BQResultSet.java

@@ -109,17 +109,7 @@ public BQResultSet(
   /** {@inheritDoc} */
   @Override
   public int findColumn(String columnLabel) throws SQLException {
-    if (this.isClosed()) {
-      throw new BQSQLException("This Resultset is Closed");
-    }
-    int columncount = this.getMetaData().getColumnCount();
-    for (int i = 1; i <= columncount; i++) {
-      if (this.getMetaData().getCatalogName(i).equals(columnLabel)) {
-        return i;
-      }
-    }
-    SQLException e = new BQSQLException("No Such column labeled: " + columnLabel);
-    throw e;
+    return CommonResultSet.findColumn(columnLabel, getMetaData());
   }
 
   /** {@inheritDoc} */

src/main/java/net/starschema/clouddb/jdbc/BQScrollableResultSet.java

@@ -137,16 +137,7 @@ public BQScrollableResultSet(
   /** {@inheritDoc} */
   @Override
   public int findColumn(String columnLabel) throws SQLException {
-    if (this.isClosed()) {
-      throw new BQSQLException("This Resultset is Closed");
-    }
-    int columncount = this.getMetaData().getColumnCount();
-    for (int i = 1; i <= columncount; i++) {
-      if (this.getMetaData().getCatalogName(i).equals(columnLabel)) {
-        return i;
-      }
-    }
-    throw new BQSQLException("No Such column labeled: " + columnLabel);
+    return CommonResultSet.findColumn(columnLabel, getMetaData());
   }
 
   /** {@inheritDoc} */

src/main/java/net/starschema/clouddb/jdbc/CommonResultSet.java

@@ -0,0 +1,27 @@
+package net.starschema.clouddb.jdbc;
+
+import com.google.cloud.bigquery.BigQuerySQLException;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+/** A static utility class of methods common to all {@link java.sql.ResultSet} implementations. */
+class CommonResultSet {
+
+  /**
+   * A common implementation of {@link java.sql.ResultSet#findColumn(String)}
+   *
+   * @param label the column-to-find's label
+   * @param metadata the metadata from the {@link java.sql.ResultSet}
+   * @return the integer index of the labeled column, if it's found
+   * @throws SQLException if no column with the given label is found
+   */
+  static int findColumn(final String label, final ResultSetMetaData metadata) throws SQLException {
+    int columnCount = metadata.getColumnCount();
+    for (int column = 1; column <= columnCount; column++) {
+      if (metadata.getColumnLabel(column).equals(label)) {
+        return column;
+      }
+    }
+    throw new BigQuerySQLException("No such Column labeled: " + label);
+  }
+}

src/test/java/net/starschema/clouddb/jdbc/BQForwardOnlyResultSetFunctionTest.java

@@ -28,6 +28,7 @@
 import com.google.gson.Gson;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -58,7 +59,7 @@
  * @author Horváth Attila
  * @author Gunics Balazs
  */
-public class BQForwardOnlyResultSetFunctionTest {
+public class BQForwardOnlyResultSetFunctionTest extends CommonTestsForResultSets {
 
   private static java.sql.Connection con = null;
   private java.sql.ResultSet resultForTest = null;
@@ -845,4 +846,10 @@ public void testStatelessQuery() throws SQLException {
     Assertions.assertThat(bqResultSet.getJobId()).isNull();
     Assertions.assertThat(bqResultSet.getQueryId()).contains("!");
   }
+
+  @Override
+  protected Statement createStatementForCommonTests(final Connection connection)
+      throws SQLException {
+    return connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+  }
 }

src/test/java/net/starschema/clouddb/jdbc/BQScrollableResultSetFunctionTest.java

@@ -22,6 +22,7 @@
 
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,6 +32,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +43,7 @@
  * @author Horváth Attila
  * @author Gunics Balazs
  */
-public class BQScrollableResultSetFunctionTest {
+public class BQScrollableResultSetFunctionTest extends CommonTestsForResultSets {
 
   private static java.sql.Connection con = null;
   private static java.sql.ResultSet Result = null;
@@ -745,4 +747,31 @@ public void testStatelessQuery() throws SQLException {
     Assertions.assertThat(bqResultSet.getJobId()).isNull();
     Assertions.assertThat(bqResultSet.getQueryId()).contains("!");
   }
+
+  @Override
+  protected Statement createStatementForCommonTests(Connection connection) throws SQLException {
+    return connection.createStatement(
+        ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+  }
+
+  @Override
+  @Test
+  @Ignore(
+      "Contradiction between BQSCrollableResultSet and BQForwardOnlyResultSet "
+          + "dates and times: b/317107706")
+  public void testGetTimeByLabel() throws SQLException {}
+
+  @Override
+  @Test
+  @Ignore(
+      "Contradiction between BQSCrollableResultSet and BQForwardOnlyResultSet "
+          + "dates and times: b/317107706")
+  public void testGetDateByLabel() throws SQLException {}
+
+  @Override
+  @Test
+  @Ignore(
+      "Contradiction between BQSCrollableResultSet and BQForwardOnlyResultSet "
+          + "dates and times: b/317107706")
+  public void testGetTimestampByLabel() throws SQLException {}
 }