Skip to content

fix(bigquery-jdbc): correct FilterTablesOnDefaultDataset fallback logic #13625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keshavdandeva merged 2 commits into from
Jul 6, 2026
+22 −25
Merged

fix(bigquery-jdbc): correct FilterTablesOnDefaultDataset fallback logic #13625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fc0adb
fix(bigquery-jdbc): align `FilterTablesOnDefaultDataset` fallback logic
keshavdandeva Jul 1, 2026
6866b91
Merge branch 'main' into jdbc/fix-FilterTablesOnDefaultDataset
keshavdandeva Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions ...-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,19 +1548,19 @@ Comparator<FieldValueList> defineGetProcedureColumnsComparator(FieldList resultS
public ResultSet getTables(
String catalog, String schemaPattern, String tableNamePattern, String[] types) {

Tuple<String, String> effectiveIdentifiers =
determineEffectiveCatalogAndSchema(catalog, schemaPattern);
String effectiveCatalog = effectiveIdentifiers.x();
String effectiveSchemaPattern = effectiveIdentifiers.y();

if ((effectiveCatalog != null && effectiveCatalog.isEmpty())
|| (effectiveSchemaPattern != null && effectiveSchemaPattern.isEmpty())
if ((catalog != null && catalog.isEmpty())
|| (schemaPattern != null && schemaPattern.isEmpty())
|| (tableNamePattern != null && tableNamePattern.isEmpty())) {
LOG.warning(
"Returning empty ResultSet as one or more patterns are empty or catalog is empty.");
return new BigQueryJsonResultSet();
}

Tuple<String, String> effectiveIdentifiers =
determineEffectiveCatalogAndSchema(catalog, schemaPattern);
String effectiveCatalog = effectiveIdentifiers.x();
String effectiveSchemaPattern = effectiveIdentifiers.y();

LOG.info(
"getTables called for catalog: %s, schemaPattern: %s, tableNamePattern: %s, types: %s",
effectiveCatalog, effectiveSchemaPattern, tableNamePattern, Arrays.toString(types));
Expand Down Expand Up @@ -1865,20 +1865,20 @@ static List<FieldValueList> prepareGetTableTypesRows(Schema schema) {
public ResultSet getColumns(
String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) {

Tuple<String, String> effectiveIdentifiers =
determineEffectiveCatalogAndSchema(catalog, schemaPattern);
String effectiveCatalog = effectiveIdentifiers.x();
String effectiveSchemaPattern = effectiveIdentifiers.y();

if ((effectiveCatalog != null && effectiveCatalog.isEmpty())
|| (effectiveSchemaPattern != null && effectiveSchemaPattern.isEmpty())
if ((catalog != null && catalog.isEmpty())
|| (schemaPattern != null && schemaPattern.isEmpty())
|| (tableNamePattern != null && tableNamePattern.isEmpty())
|| (columnNamePattern != null && columnNamePattern.isEmpty())) {
LOG.warning(
"Returning empty ResultSet as one or more patterns are empty or catalog is empty.");
return new BigQueryJsonResultSet();
}

Tuple<String, String> effectiveIdentifiers =
determineEffectiveCatalogAndSchema(catalog, schemaPattern);
String effectiveCatalog = effectiveIdentifiers.x();
String effectiveSchemaPattern = effectiveIdentifiers.y();

LOG.info(
"getColumns called for catalog: %s, schemaPattern: %s, tableNamePattern: %s,"
+ " columnNamePattern: %s",
Expand Down Expand Up @@ -4429,28 +4429,25 @@ private Tuple<String, String> determineEffectiveCatalogAndSchema(
// We only use the dataset part of the DefaultDataset for schema filtering
String defaultSchemaFromConnection = this.connection.getDefaultDataset().getDataset();

boolean catalogIsNullOrEmptyOrWildcard =
(catalog == null || catalog.isEmpty() || catalog.equals("%"));
boolean schemaPatternIsNullOrEmptyOrWildcard =
(schemaPattern == null || schemaPattern.isEmpty() || schemaPattern.equals("%"));
boolean catalogIsUnspecified = (effectiveCatalog == null || effectiveCatalog.equals("%"));
boolean schemaIsUnspecified =
(effectiveSchemaPattern == null || effectiveSchemaPattern.equals("%"));

final String logPrefix = "FilterTablesOnDefaultDatasetTrue: ";
if (catalogIsNullOrEmptyOrWildcard && schemaPatternIsNullOrEmptyOrWildcard) {
if (catalogIsUnspecified && schemaIsUnspecified) {
effectiveCatalog = defaultProjectFromConnection;
Comment thread
keshavdandeva marked this conversation as resolved.
effectiveSchemaPattern = defaultSchemaFromConnection;
LOG.info(
logPrefix + "Using default catalog '%s' and default dataset '%s'.",
effectiveCatalog,
effectiveSchemaPattern);
} else if (catalogIsNullOrEmptyOrWildcard) {
effectiveCatalog = defaultProjectFromConnection;
} else if (catalogIsUnspecified) {
effectiveCatalog = null;
LOG.info(
logPrefix
+ "Using default catalog '%s' with user dataset '%s'. Default dataset '%s' ignored.",
effectiveCatalog,
logPrefix + "Using all catalogs with user dataset '%s'. Default dataset '%s' ignored.",
effectiveSchemaPattern,
defaultSchemaFromConnection);
} else if (schemaPatternIsNullOrEmptyOrWildcard) {
} else if (schemaIsUnspecified) {
effectiveSchemaPattern = defaultSchemaFromConnection;
LOG.info(
logPrefix + "Using user catalog '%s' and default dataset '%s'.",
Expand Down
Loading