Skip to content

fix(bigquery-jdbc): fix naive fallback of parameter count #14779

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
Neenu1995 merged 5 commits into from
Oct 27, 2026
Merged

fix(bigquery-jdbc): fix naive fallback of parameter count #14779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef8f13f
fix(bigquery-jdbc): fix naive fallback of parameter count
Neenu1995 Oct 26, 2026
a5d5aa6
Update java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdb…
Neenu1995 Oct 26, 2026
c4a1084
Merge branch 'main' of github.com:googleapis/google-cloud-java into f…
Neenu1995 Oct 26, 2026
512df19
Merge branch 'fix-no-parameter' of github.com:googleapis/google-cloud…
Neenu1995 Oct 26, 2026
b3775a3
lint
Neenu1995 Oct 26, 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
6 changes: 4 additions & 2 deletions ...bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@ class BigQueryPreparedStatement extends BigQueryStatement implements PreparedSta
}

private int resolveParameterCount(String query, QueryStatistics queryStatistics) {
if (queryStatistics != null && queryStatistics.getQueryParameters() != null) {
return queryStatistics.getQueryParameters().size();
if (queryStatistics != null) {
return queryStatistics.getQueryParameters() == null
? 0
: queryStatistics.getQueryParameters().size();
}
return (int) query.chars().filter(ch -> ch == POSITIONAL_PARAMETER_CHAR).count();
}
Expand Down
13 changes: 13 additions & 0 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,19 @@ public void testPreparedQueryWithExtraPositionalParameterCharacter() throws SQLE
ResultSet selectResult2 = selectStmt.executeQuery();
assertNotNull(selectResult2);

// string literal with ? should pass even if there are no parameters.
String noParameterQuery =
String.format("SELECT 'Hello, ?World!' FROM %s.%s", DATASET, TABLE_NAME);

PreparedStatement noParameterStmt = bigQueryConnection.prepareStatement(noParameterQuery);

// Tests that parameter Metadata is populated before query execution and setter.
ParameterMetaData noParameterMetaData = noParameterStmt.getParameterMetaData();
assertNotNull(noParameterMetaData);
assertEquals(0, noParameterMetaData.getParameterCount());

ResultSet selectResult3 = noParameterStmt.executeQuery();

boolean dropStatus = bigQueryStatement.execute(dropQuery);
assertFalse(dropStatus);
}
Expand Down
Loading