@@ -131,6 +131,7 @@ public class DataSource implements javax.sql.DataSource {
131131 private OpenTelemetry customOpenTelemetry ;
132132 private boolean useGlobalOpenTelemetry = BigQueryJdbcUrlUtility .DEFAULT_USE_GLOBAL_OTEL_VALUE ;
133133 private Boolean enableDiagnosticTelemetry ;
134+ private Boolean enableGraphMetadata ;
134135
135136 // Make sure the JDBC driver class is loaded.
136137 static {
@@ -157,13 +158,13 @@ public class DataSource implements javax.sql.DataSource {
157158 BigQueryJdbcUrlUtility .ENABLE_HTAPI_PROPERTY_NAME ,
158159 (ds , val ) ->
159160 ds .setEnableHighThroughputAPI (
160- BigQueryJdbcUrlUtility .convertIntToBoolean (
161+ BigQueryJdbcUrlUtility .convertToBoolean (
161162 val , BigQueryJdbcUrlUtility .ENABLE_HTAPI_PROPERTY_NAME )))
162163 .put (
163164 BigQueryJdbcUrlUtility .UNSUPPORTED_HTAPI_FALLBACK_PROPERTY_NAME ,
164165 (ds , val ) ->
165166 ds .setUnsupportedHTAPIFallback (
166- BigQueryJdbcUrlUtility .convertIntToBoolean (
167+ BigQueryJdbcUrlUtility .convertToBoolean (
167168 val , BigQueryJdbcUrlUtility .UNSUPPORTED_HTAPI_FALLBACK_PROPERTY_NAME )))
168169 .put (
169170 BigQueryJdbcUrlUtility .HTAPI_MIN_TABLE_SIZE_PROPERTY_NAME ,
@@ -182,13 +183,13 @@ public class DataSource implements javax.sql.DataSource {
182183 BigQueryJdbcUrlUtility .ENABLE_SESSION_PROPERTY_NAME ,
183184 (ds , val ) ->
184185 ds .setEnableSession (
185- BigQueryJdbcUrlUtility .convertIntToBoolean (
186+ BigQueryJdbcUrlUtility .convertToBoolean (
186187 val , BigQueryJdbcUrlUtility .ENABLE_SESSION_PROPERTY_NAME )))
187188 .put (
188189 BigQueryJdbcUrlUtility .ENABLE_TIMESTAMP_PICOS_PROPERTY_NAME ,
189190 (ds , val ) ->
190191 ds .setEnableTimestampPicos (
191- BigQueryJdbcUrlUtility .convertIntToBoolean (
192+ BigQueryJdbcUrlUtility .convertToBoolean (
192193 val , BigQueryJdbcUrlUtility .ENABLE_TIMESTAMP_PICOS_PROPERTY_NAME )))
193194 .put (BigQueryJdbcUrlUtility .LOG_LEVEL_PROPERTY_NAME , DataSource ::setLogLevel )
194195 .put (BigQueryJdbcUrlUtility .LOG_PATH_PROPERTY_NAME , DataSource ::setLogPath )
@@ -209,7 +210,7 @@ public class DataSource implements javax.sql.DataSource {
209210 BigQueryJdbcUrlUtility .OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME ,
210211 (ds , val ) ->
211212 ds .setOAuthAccessTokenReadonly (
212- BigQueryJdbcUrlUtility .convertIntToBoolean (
213+ BigQueryJdbcUrlUtility .convertToBoolean (
213214 val , BigQueryJdbcUrlUtility .OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME )))
214215 .put (
215216 BigQueryJdbcUrlUtility .OAUTH_REFRESH_TOKEN_PROPERTY_NAME ,
@@ -218,14 +219,14 @@ public class DataSource implements javax.sql.DataSource {
218219 BigQueryJdbcUrlUtility .USE_QUERY_CACHE_PROPERTY_NAME ,
219220 (ds , val ) ->
220221 ds .setUseQueryCache (
221- BigQueryJdbcUrlUtility .convertIntToBoolean (
222+ BigQueryJdbcUrlUtility .convertToBoolean (
222223 val , BigQueryJdbcUrlUtility .USE_QUERY_CACHE_PROPERTY_NAME )))
223224 .put (BigQueryJdbcUrlUtility .QUERY_DIALECT_PROPERTY_NAME , DataSource ::setQueryDialect )
224225 .put (
225226 BigQueryJdbcUrlUtility .ALLOW_LARGE_RESULTS_PROPERTY_NAME ,
226227 (ds , val ) ->
227228 ds .setAllowLargeResults (
228- BigQueryJdbcUrlUtility .convertIntToBoolean (
229+ BigQueryJdbcUrlUtility .convertToBoolean (
229230 val , BigQueryJdbcUrlUtility .ALLOW_LARGE_RESULTS_PROPERTY_NAME )))
230231 .put (
231232 BigQueryJdbcUrlUtility .LARGE_RESULTS_TABLE_PROPERTY_NAME ,
@@ -258,7 +259,7 @@ public class DataSource implements javax.sql.DataSource {
258259 BigQueryJdbcUrlUtility .ENABLE_WRITE_API_PROPERTY_NAME ,
259260 (ds , val ) ->
260261 ds .setEnableWriteAPI (
261- BigQueryJdbcUrlUtility .convertIntToBoolean (
262+ BigQueryJdbcUrlUtility .convertToBoolean (
262263 val , BigQueryJdbcUrlUtility .ENABLE_WRITE_API_PROPERTY_NAME )))
263264 .put (
264265 BigQueryJdbcUrlUtility .ADDITIONAL_PROJECTS_PROPERTY_NAME ,
@@ -267,14 +268,14 @@ public class DataSource implements javax.sql.DataSource {
267268 BigQueryJdbcUrlUtility .FILTER_TABLES_ON_DEFAULT_DATASET_PROPERTY_NAME ,
268269 (ds , val ) ->
269270 ds .setFilterTablesOnDefaultDataset (
270- BigQueryJdbcUrlUtility .convertIntToBoolean (
271+ BigQueryJdbcUrlUtility .convertToBoolean (
271272 val ,
272273 BigQueryJdbcUrlUtility .FILTER_TABLES_ON_DEFAULT_DATASET_PROPERTY_NAME )))
273274 .put (
274275 BigQueryJdbcUrlUtility .ENABLE_PROJECT_DISCOVERY_PROPERTY_NAME ,
275276 (ds , val ) ->
276277 ds .setEnableProjectDiscovery (
277- BigQueryJdbcUrlUtility .convertIntToBoolean (
278+ BigQueryJdbcUrlUtility .convertToBoolean (
278279 val , BigQueryJdbcUrlUtility .ENABLE_PROJECT_DISCOVERY_PROPERTY_NAME )))
279280 .put (
280281 BigQueryJdbcUrlUtility .REQUEST_GOOGLE_DRIVE_SCOPE_PROPERTY_NAME ,
@@ -376,26 +377,32 @@ public class DataSource implements javax.sql.DataSource {
376377 BigQueryJdbcUrlUtility .ENABLE_GCP_TRACE_EXPORTER_PROPERTY_NAME ,
377378 (ds , val ) ->
378379 ds .setEnableGcpTraceExporter (
379- BigQueryJdbcUrlUtility .convertIntToBoolean (
380+ BigQueryJdbcUrlUtility .convertToBoolean (
380381 val , BigQueryJdbcUrlUtility .ENABLE_GCP_TRACE_EXPORTER_PROPERTY_NAME )))
381382 .put (
382383 BigQueryJdbcUrlUtility .ENABLE_GCP_LOG_EXPORTER_PROPERTY_NAME ,
383384 (ds , val ) ->
384385 ds .setEnableGcpLogExporter (
385- BigQueryJdbcUrlUtility .convertIntToBoolean (
386+ BigQueryJdbcUrlUtility .convertToBoolean (
386387 val , BigQueryJdbcUrlUtility .ENABLE_GCP_LOG_EXPORTER_PROPERTY_NAME )))
387388 .put (
388389 BigQueryJdbcUrlUtility .USE_GLOBAL_OTEL_PROPERTY_NAME ,
389390 (ds , val ) ->
390391 ds .setUseGlobalOpenTelemetry (
391- BigQueryJdbcUrlUtility .convertIntToBoolean (
392+ BigQueryJdbcUrlUtility .convertToBoolean (
392393 val , BigQueryJdbcUrlUtility .USE_GLOBAL_OTEL_PROPERTY_NAME )))
393394 .put (
394395 BigQueryJdbcUrlUtility .ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME ,
395396 (ds , val ) ->
396397 ds .setEnableDiagnosticTelemetry (
397- BigQueryJdbcUrlUtility .convertIntToBoolean (
398+ BigQueryJdbcUrlUtility .convertToBoolean (
398399 val , BigQueryJdbcUrlUtility .ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME )))
400+ .put (
401+ BigQueryJdbcUrlUtility .ENABLE_GRAPH_METADATA_PROPERTY_NAME ,
402+ (ds , val ) ->
403+ ds .setEnableGraphMetadata (
404+ BigQueryJdbcUrlUtility .convertToBoolean (
405+ val , BigQueryJdbcUrlUtility .ENABLE_GRAPH_METADATA_PROPERTY_NAME )))
399406 .build ();
400407
401408 public static DataSource fromUrl (String url ) {
@@ -738,6 +745,11 @@ Properties createProperties() {
738745 BigQueryJdbcUrlUtility .USE_GLOBAL_OTEL_PROPERTY_NAME ,
739746 String .valueOf (this .useGlobalOpenTelemetry ));
740747 }
748+ if (this .enableGraphMetadata != null ) {
749+ connectionProperties .setProperty (
750+ BigQueryJdbcUrlUtility .ENABLE_GRAPH_METADATA_PROPERTY_NAME ,
751+ String .valueOf (this .enableGraphMetadata ));
752+ }
741753 connectionProperties .setProperty (
742754 BigQueryJdbcUrlUtility .ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME ,
743755 String .valueOf (getEnableDiagnosticTelemetry ()));
@@ -1537,6 +1549,16 @@ public void setPrivateServiceConnect(String privateServiceConnect) {
15371549 this .privateServiceConnect = privateServiceConnect ;
15381550 }
15391551
1552+ public boolean getEnableGraphMetadata () {
1553+ return enableGraphMetadata != null
1554+ ? enableGraphMetadata
1555+ : BigQueryJdbcUrlUtility .DEFAULT_ENABLE_GRAPH_METADATA_VALUE ;
1556+ }
1557+
1558+ public void setEnableGraphMetadata (Boolean enableGraphMetadata ) {
1559+ this .enableGraphMetadata = enableGraphMetadata ;
1560+ }
1561+
15401562 @ Override
15411563 public PrintWriter getLogWriter () {
15421564 return null ;
0 commit comments