diff --git a/crates/configuration/src/version3/mod.rs b/crates/configuration/src/version3/mod.rs index eff1a9dec..9499df2f6 100644 --- a/crates/configuration/src/version3/mod.rs +++ b/crates/configuration/src/version3/mod.rs @@ -30,7 +30,6 @@ pub const DEFAULT_CONNECTION_URI_VARIABLE: &str = "CONNECTION_URI"; pub struct RawConfiguration { // Connection string for a Postgres-compatible database pub connection_uri: ConnectionUri, - #[serde(skip_serializing_if = "PoolSettings::is_default")] #[serde(default)] pub pool_settings: PoolSettings, #[serde(default)] diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_configuration_schema.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_configuration_schema.snap index 097403e7b..7f930b522 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_configuration_schema.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_configuration_schema.snap @@ -25,7 +25,17 @@ expression: schema "$ref": "#/definitions/ConnectionUri" }, "poolSettings": { - "$ref": "#/definitions/PoolSettings" + "default": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, + "allOf": [ + { + "$ref": "#/definitions/PoolSettings" + } + ] }, "isolationLevel": { "default": "ReadCommitted", diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_rawconfiguration_v3_schema.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_rawconfiguration_v3_schema.snap index 9c521baa8..2df4826b6 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_rawconfiguration_v3_schema.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__get_rawconfiguration_v3_schema.snap @@ -15,7 +15,17 @@ expression: schema "$ref": "#/definitions/ConnectionUri" }, "poolSettings": { - "$ref": "#/definitions/PoolSettings" + "default": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, + "allOf": [ + { + "$ref": "#/definitions/PoolSettings" + } + ] }, "isolationLevel": { "default": "ReadCommitted", diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__postgres_current_only_configure_v3_initial_configuration_is_unchanged.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__postgres_current_only_configure_v3_initial_configuration_is_unchanged.snap index 6baa49d72..f15cad200 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__postgres_current_only_configure_v3_initial_configuration_is_unchanged.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__postgres_current_only_configure_v3_initial_configuration_is_unchanged.snap @@ -6,6 +6,12 @@ expression: default_configuration "connectionUri": { "variable": "MAGIC_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": { diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__openapi_tests__openapi__up_to_date_generated_schema.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__openapi_tests__openapi__up_to_date_generated_schema.snap index 646f1bf3f..40a6c9ba3 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__openapi_tests__openapi__up_to_date_generated_schema.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__openapi_tests__openapi__up_to_date_generated_schema.snap @@ -25,7 +25,17 @@ expression: generated_schema_json "$ref": "#/components/schemas/ConnectionUri" }, "poolSettings": { - "$ref": "#/components/schemas/PoolSettings" + "default": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, + "allOf": [ + { + "$ref": "#/components/schemas/PoolSettings" + } + ] }, "isolationLevel": { "default": "ReadCommitted", diff --git a/static/citus/v3-chinook-ndc-metadata/configuration.json b/static/citus/v3-chinook-ndc-metadata/configuration.json index 14511725f..4aea52d28 100644 --- a/static/citus/v3-chinook-ndc-metadata/configuration.json +++ b/static/citus/v3-chinook-ndc-metadata/configuration.json @@ -3,6 +3,12 @@ "connectionUri": { "variable": "CONNECTION_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": { diff --git a/static/cockroach/v3-chinook-ndc-metadata/configuration.json b/static/cockroach/v3-chinook-ndc-metadata/configuration.json index accee0b7b..59bf1dbec 100644 --- a/static/cockroach/v3-chinook-ndc-metadata/configuration.json +++ b/static/cockroach/v3-chinook-ndc-metadata/configuration.json @@ -3,6 +3,12 @@ "connectionUri": { "variable": "CONNECTION_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": { diff --git a/static/postgres/broken-queries-ndc-metadata/configuration.json b/static/postgres/broken-queries-ndc-metadata/configuration.json index 2bc618ebc..d885e27a1 100644 --- a/static/postgres/broken-queries-ndc-metadata/configuration.json +++ b/static/postgres/broken-queries-ndc-metadata/configuration.json @@ -3,6 +3,12 @@ "connectionUri": { "variable": "CONNECTION_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": {}, diff --git a/static/postgres/v3-chinook-ndc-metadata/configuration.json b/static/postgres/v3-chinook-ndc-metadata/configuration.json index ae9cb24a3..a95eb1a5a 100644 --- a/static/postgres/v3-chinook-ndc-metadata/configuration.json +++ b/static/postgres/v3-chinook-ndc-metadata/configuration.json @@ -3,6 +3,12 @@ "connectionUri": { "variable": "CONNECTION_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": { diff --git a/static/yugabyte/v3-chinook-ndc-metadata/configuration.json b/static/yugabyte/v3-chinook-ndc-metadata/configuration.json index a2d054d5b..0fcaf0900 100644 --- a/static/yugabyte/v3-chinook-ndc-metadata/configuration.json +++ b/static/yugabyte/v3-chinook-ndc-metadata/configuration.json @@ -3,6 +3,12 @@ "connectionUri": { "variable": "CONNECTION_URI" }, + "poolSettings": { + "maxConnections": 50, + "poolTimeout": 30, + "idleTimeout": 180, + "connectionLifetime": 600 + }, "isolationLevel": "ReadCommitted", "metadata": { "tables": {