Allow field names to start with reserved keywords (fix #3597) (#3927)

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bug fixes and improvements
 
 - docs: add One-Click Render deployment guide (close #3683) (#4209)
+- server: reserved keywords in column references break parser (fix #3597) #3927
 
 ## `v1.2.0-beta.3`
 

server/cabal.project

@@ -34,7 +34,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/hasura/graphql-parser-hs.git
-  tag: 088acdf9120c4bea11f6185dfb587bd04ee2cb54
+  tag: 1380495a7b3269b70a7ab3081d745a5f54171a9c
 
 source-repository-package
   type: git

server/tests-py/queries/graphql_mutation/insert/nullprefixcolumn/null_prefixed_column_ok.yaml

@@ -0,0 +1,19 @@
+description: |
+  Using "null" prefixed columns in on_conflict clause should behave normally.
+  Regression test for #3597.
+
+url: /v1/graphql
+status: 200
+query:
+  query: |
+    mutation {
+      insert_nullPrefixTestTable(objects: [{nullName: "2"}]
+      on_conflict:{constraint:nullPrefixTestTable_pkey, update_columns:[nullName]}){
+        affected_rows
+      }
+    }
+
+response:
+  data:
+    insert_nullPrefixTestTable:
+      affected_rows: 1

server/tests-py/queries/graphql_mutation/insert/nullprefixcolumn/setup.yaml

@@ -0,0 +1,16 @@
+type: bulk
+args:
+
+#Test table
+- type: run_sql
+  args:
+    sql: |
+      create table "nullPrefixTestTable"(
+          id serial primary key,
+          "nullName" text
+      );
+- type: track_table
+  args:
+    schema: public
+    name: "nullPrefixTestTable"
+

server/tests-py/queries/graphql_mutation/insert/nullprefixcolumn/teardown.yaml

@@ -0,0 +1,7 @@
+type: bulk
+args:
+
+- type: run_sql
+  args:
+    sql: |
+      drop table "nullPrefixTestTable"

server/tests-py/test_graphql_mutations.py

@@ -187,6 +187,18 @@ class TestGraphqlInsertConstraints:
         return "queries/graphql_mutation/insert/constraints"
 
 
+@pytest.mark.parametrize("transport", ['http', 'websocket'])
+@usefixtures('per_class_tests_db_state')
+class TestGraphqlInsertNullPrefixedColumnOnConflict:
+
+    def test_address_not_null_constraint_err(self, hge_ctx, transport):
+        check_query_f(hge_ctx, self.dir() + "/null_prefixed_column_ok.yaml")
+
+    @classmethod
+    def dir(cls):
+        return "queries/graphql_mutation/insert/nullprefixcolumn"
+
+
 @pytest.mark.parametrize("transport", ['http', 'websocket'])
 @use_mutation_fixtures
 class TestGraphqlInsertGeoJson: