feedback

Author: logachev

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

@@ -2638,15 +2638,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 {
-      Statement stmt = this.connection.createStatement();
       stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
       return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getPrimaryKeys", e);
     }
   }
@@ -2655,12 +2667,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 {
-      Statement stmt = this.connection.createStatement();
       stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
       return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getImportedKeys", e);
     }
   }
@@ -2669,12 +2682,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 {
-      Statement stmt = this.connection.createStatement();
       stmt.closeOnCompletion();
       String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
       return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getExportedKeys", e);
     }
   }
@@ -2689,8 +2703,8 @@ public ResultSet getCrossReference(
       String foreignTable)
       throws SQLException {
     String sql = readSqlFromFile(GET_CROSS_REFERENCE_SQL);
+    Statement stmt = this.connection.createStatement();
     try {
-      Statement stmt = this.connection.createStatement();
       stmt.closeOnCompletion();
       String formattedSql =
           replaceSqlParameters(
@@ -2703,6 +2717,7 @@ public ResultSet getCrossReference(
               foreignTable);
       return stmt.executeQuery(formattedSql);
     } catch (SQLException e) {
+      closeStatementIgnoreException(stmt);
       throw new BigQueryJdbcException("Error executing getCrossReference", e);
     }
   }