use stored instead of isgenerated

hasura · Jan 18, 2024 · 8c4f3ae · 8c4f3ae
1 parent cc8b272
commit 8c4f3ae
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 10 deletions.
diff --git a/crates/connectors/ndc-postgres/src/configuration/version2.sql b/crates/connectors/ndc-postgres/src/configuration/version2.sql
@@ -111,7 +111,7 @@ WITH
       END
       AS is_identity,
       CASE WHEN attgenerated_exists
-	       THEN CASE WHEN attgenerated::text = 's' THEN 'isGenerated' ELSE 'notGenerated' END
+	       THEN CASE WHEN attgenerated::text = 's' THEN 'stored' ELSE 'notGenerated' END
            ELSE 'notGenerated'
       END as is_generated
     FROM

diff --git a/crates/connectors/ndc-postgres/src/schema.rs b/crates/connectors/ndc-postgres/src/schema.rs
@@ -349,7 +349,7 @@ fn make_object_type(
         match column {
             // columns that are generated or are always identity should not be insertable.
             metadata::database::ColumnInfo {
-                is_generated: metadata::database::IsGenerated::IsGenerated,
+                is_generated: metadata::database::IsGenerated::Stored,
                 ..
             }
             | metadata::database::ColumnInfo {

diff --git a/crates/query-engine/metadata/src/metadata/database.rs b/crates/query-engine/metadata/src/metadata/database.rs
@@ -122,7 +122,7 @@ pub enum IsIdentity {
 pub enum IsGenerated {
     #[default]
     NotGenerated,
-    IsGenerated,
+    Stored,
 }
 
 /// Information about a database column.

diff --git a/crates/query-engine/translation/src/translation/mutation/insert.rs b/crates/query-engine/translation/src/translation/mutation/insert.rs
@@ -102,7 +102,7 @@ fn check_columns(
             } => Ok(()),
             // generated columns must not be inserted into.
             database::ColumnInfo {
-                is_generated: database::IsGenerated::IsGenerated,
+                is_generated: database::IsGenerated::Stored,
                 ..
             } => {
                 if inserted_columns.contains(&ast::ColumnName(column.name.clone())) {

diff --git a/..._tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap b/..._tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap
@@ -1163,7 +1163,7 @@ expression: schema
       "type": "string",
       "enum": [
         "notGenerated",
-        "isGenerated"
+        "stored"
       ]
     },
     "CompositeTypes": {

diff --git a/...__postgres__configuration_tests__configuration_tests__get_rawconfiguration_v2_schema.snap b/...__postgres__configuration_tests__configuration_tests__get_rawconfiguration_v2_schema.snap
@@ -586,7 +586,7 @@ expression: schema
       "type": "string",
       "enum": [
         "notGenerated",
-        "isGenerated"
+        "stored"
       ]
     },
     "UniquenessConstraints": {

diff --git a/...uration_tests__postgres_current_only_configure_v2_initial_configuration_is_unchanged.snap b/...uration_tests__postgres_current_only_configure_v2_initial_configuration_is_unchanged.snap
@@ -787,7 +787,7 @@ expression: default_configuration
             },
             "nullable": "nullable",
             "hasDefault": "hasDefault",
-            "isGenerated": "isGenerated",
+            "isGenerated": "stored",
             "description": null
           },
           "id": {

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
@@ -1135,7 +1135,7 @@ expression: generated_schema_json
       "type": "string",
       "enum": [
         "notGenerated",
-        "isGenerated"
+        "stored"
       ]
     },
     "CompositeTypes": {

diff --git a/...aa1f73dbd64e128786bc7c624531a7f7ca70.json → ...55716a6b388a9f0f7ac6cbc3bb294a67def0.json b/...aa1f73dbd64e128786bc7c624531a7f7ca70.json → ...55716a6b388a9f0f7ac6cbc3bb294a67def0.json
@@ -761,7 +761,7 @@
             },
             "nullable": "nullable",
             "hasDefault": "hasDefault",
-            "isGenerated": "isGenerated",
+            "isGenerated": "stored",
             "description": null
           },
           "id": {
@@ -1046,6 +1046,30 @@
       }
     },
     "nativeQueries": {
+      "address_identity_function": {
+        "sql": "SELECT {{address}} as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "compositeType": "person_address"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "address": {
+            "name": "address",
+            "type": {
+              "compositeType": "person_address"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support for composite types"
+      },
       "album_by_title": {
         "sql": "SELECT * FROM public.\"Album\" WHERE \"Title\" LIKE {{title}} AND \"AlbumId\" < {{id}}",
         "columns": {

diff --git a/static/postgres/v2-chinook-deployment.json b/static/postgres/v2-chinook-deployment.json
@@ -761,7 +761,7 @@
             },
             "nullable": "nullable",
             "hasDefault": "hasDefault",
-            "isGenerated": "isGenerated",
+            "isGenerated": "stored",
             "description": null
           },
           "id": {