resolve conflicts

Author: Neenu1995

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

@@ -141,7 +141,6 @@ class BigQueryDatabaseMetaData implements DatabaseMetaData {
 
   String URL;
   BigQueryConnection connection;
-  Statement statement = null;
   private final BigQuery bigquery;
   private final int metadataFetchThreadCount;
   private static final AtomicReference<String> parsedDriverVersion = new AtomicReference<>(null);
@@ -2641,16 +2640,27 @@ Schema defineGetVersionColumnsSchema() {
     return Schema.of(fields);
   }
 
+  private void closeStatementIgnoreException(Statement statement) {
+    if (statement == null) {
+      return;
+    }
+    try {
+      statement.close();
+    } catch (SQLException e) {
+      // pass
+    }
+  }
+
   @Override
   public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
     String sql = readSqlFromFile(GET_PRIMARY_KEYS_SQL);
+    Statement stmt = this.connection.createStatement();
     try {
-      if (this.statement == null) {
-        this.statement = this.connection.createStatement();
-      }
+      stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
-      return this.statement.executeQuery(formattedSql);
+      return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getPrimaryKeys", e);
     }
   }
@@ -2659,13 +2669,13 @@ public ResultSet getPrimaryKeys(String catalog, String schema, String table) thr
   public ResultSet getImportedKeys(String catalog, String schema, String table)
       throws SQLException {
     String sql = readSqlFromFile(GET_IMPORTED_KEYS_SQL);
+    Statement stmt = this.connection.createStatement();
     try {
-      if (this.statement == null) {
-        this.statement = this.connection.createStatement();
-      }
+      stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
-      return this.statement.executeQuery(formattedSql);
+      return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getImportedKeys", e);
     }
   }
@@ -2674,13 +2684,13 @@ public ResultSet getImportedKeys(String catalog, String schema, String table)
   public ResultSet getExportedKeys(String catalog, String schema, String table)
       throws SQLException {
     String sql = readSqlFromFile(GET_EXPORTED_KEYS_SQL);
+    Statement stmt = this.connection.createStatement();
     try {
-      if (this.statement == null) {
-        this.statement = this.connection.createStatement();
-      }
+      stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
-      return this.statement.executeQuery(formattedSql);
+      return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getExportedKeys", e);
     }
   }
@@ -2695,10 +2705,9 @@ public ResultSet getCrossReference(
       String foreignTable)
       throws SQLException {
     String sql = readSqlFromFile(GET_CROSS_REFERENCE_SQL);
+    Statement stmt = this.connection.createStatement();
     try {
-      if (this.statement == null) {
-        this.statement = this.connection.createStatement();
-      }
+      stmt.closeOnCompletion();
       String formattedSql =
           replaceSqlParameters(
               sql,
@@ -2708,8 +2717,9 @@ public ResultSet getCrossReference(
               foreignCatalog,
               foreignSchema,
               foreignTable);
-      return this.statement.executeQuery(formattedSql);
+      return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getCrossReference", e);
     }
   }

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaDataTest.java

@@ -342,7 +342,7 @@ public void testMapBigQueryTypeToJdbc_ScalarTypes() {
     assertEquals(Integer.valueOf(38), infoBigNumeric.decimalDigits);
     assertEquals(Integer.valueOf(10), infoBigNumeric.numPrecRadix);
 
-    // GEOGRAPHY -> VARCHAR
+    // GEOGRAPHY -> OTHER
     Field fieldGeo =
         Field.newBuilder("test_geo", StandardSQLTypeName.GEOGRAPHY)
             .setMode(Field.Mode.NULLABLE)
@@ -352,6 +352,27 @@ public void testMapBigQueryTypeToJdbc_ScalarTypes() {
     assertEquals("GEOGRAPHY", infoGeo.typeName);
     assertNull(infoGeo.columnSize);
 
+    // JSON -> OTHER
+    Field fieldJson =
+        Field.newBuilder("test_json", StandardSQLTypeName.JSON)
+            .setMode(Field.Mode.NULLABLE)
+            .build();
+    BigQueryDatabaseMetaData.ColumnTypeInfo infoJson = dbMetadata.mapBigQueryTypeToJdbc(fieldJson);
+    assertEquals(Types.OTHER, infoJson.jdbcType);
+    assertEquals("JSON", infoJson.typeName);
+    assertNull(infoJson.columnSize);
+
+    // INTERVAL -> OTHER
+    Field fieldInterval =
+        Field.newBuilder("test_interval", StandardSQLTypeName.INTERVAL)
+            .setMode(Field.Mode.NULLABLE)
+            .build();
+    BigQueryDatabaseMetaData.ColumnTypeInfo infoInterval =
+        dbMetadata.mapBigQueryTypeToJdbc(fieldInterval);
+    assertEquals(Types.OTHER, infoInterval.jdbcType);
+    assertEquals("INTERVAL", infoInterval.typeName);
+    assertNull(infoInterval.columnSize);
+
     // DATE
     Field fieldDate =
         Field.newBuilder("test_date", StandardSQLTypeName.DATE)
@@ -3224,4 +3245,34 @@ public void testWrapperMethods() throws SQLException {
       assertTrue(e.getMessage().contains("Cannot unwrap to java.sql.Connection"));
     }
   }
+
+  @Test
+  public void testMetadataMethodsDoNotInterfere() throws SQLException {
+    Statement mockStatement1 = mock(Statement.class);
+    Statement mockStatement2 = mock(Statement.class);
+    ResultSet mockResultSet1 = mock(ResultSet.class);
+    ResultSet mockResultSet2 = mock(ResultSet.class);
+
+    when(bigQueryConnection.createStatement())
+        .thenReturn(mockStatement1)
+        .thenReturn(mockStatement2);
+
+    when(mockStatement1.executeQuery(any())).thenReturn(mockResultSet1);
+    when(mockStatement2.executeQuery(any())).thenReturn(mockResultSet2);
+
+    // Call first metadata method
+    ResultSet rs1 = dbMetadata.getPrimaryKeys("cat", "schema", "table");
+    assertSame(mockResultSet1, rs1);
+
+    // Call second metadata method
+    ResultSet rs2 = dbMetadata.getImportedKeys("cat", "schema", "table");
+    assertSame(mockResultSet2, rs2);
+
+    // Verify closeOnCompletion was called on both statements
+    verify(mockStatement1).closeOnCompletion();
+    verify(mockStatement2).closeOnCompletion();
+
+    // Verify connection.createStatement() was called twice
+    verify(bigQueryConnection, times(2)).createStatement();
+  }
 }

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITDatabaseMetadataTest.java

@@ -341,6 +341,40 @@ public void testTableConstraints() throws SQLException {
     connection.close();
   }
 
+  @Test
+  public void testMetadataResultSetsDoNotInterfere() throws SQLException {
+    try (Connection connection =
+        DriverManager.getConnection(String.format(connectionUrl, DEFAULT_CATALOG))) {
+      DatabaseMetaData metaData = connection.getMetaData();
+
+      // Get primary keys for table 1
+      ResultSet primaryKeys1 =
+          metaData.getPrimaryKeys(PROJECT_ID, CONSTRAINTS_DATASET, CONSTRAINTS_TABLE_NAME);
+
+      // Get imported keys for table 1, BEFORE fully consuming primaryKeys1
+      ResultSet importedKeys =
+          metaData.getImportedKeys(PROJECT_ID, CONSTRAINTS_DATASET, CONSTRAINTS_TABLE_NAME);
+
+      // Now try to read from primaryKeys1
+      Assertions.assertTrue(primaryKeys1.next());
+      Assertions.assertEquals("id", primaryKeys1.getString("COLUMN_NAME"));
+
+      // Read from importedKeys
+      Assertions.assertTrue(importedKeys.next());
+      Assertions.assertEquals(CONSTRAINTS_TABLE_NAME2, importedKeys.getString("PKTABLE_NAME"));
+
+      // Read more from primaryKeys1 (should be finished now)
+      Assertions.assertFalse(primaryKeys1.next());
+
+      // Read more from importedKeys
+      Assertions.assertTrue(importedKeys.next());
+      Assertions.assertEquals(CONSTRAINTS_TABLE_NAME2, importedKeys.getString("PKTABLE_NAME"));
+
+      primaryKeys1.close();
+      importedKeys.close();
+    }
+  }
+
   @Test
   public void testDatabaseMetadataGetCatalogs() throws SQLException {