Make poolSettings an explicit default

hasura · Mar 11, 2024 · 5f9de83 · 5f9de83
1 parent 78ce366
commit 5f9de83
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 4 deletions.
diff --git 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/...s/snapshots/databases_tests__postgres__configuration_tests__get_configuration_schema.snap b/...s/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/...shots/databases_tests__postgres__configuration_tests__get_rawconfiguration_v3_schema.snap b/...shots/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/...uration_tests__postgres_current_only_configure_v3_initial_configuration_is_unchanged.snap b/...uration_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/...shots/databases_tests__postgres__openapi_tests__openapi__up_to_date_generated_schema.snap b/...shots/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,6 +3,12 @@
   "connectionUri": {
     "variable": "CONNECTION_URI"
   },
+  "poolSettings": {
+    "maxConnections": 50,
+    "poolTimeout": 30,
+    "idleTimeout": 180,
+    "connectionLifetime": 600
+  },
   "isolationLevel": "ReadCommitted",
   "metadata": {
     "tables": {