re-add name for pg dialect conflicts

gzzo · Apr 16, 2021 · 54a30d0 · 54a30d0
1 parent 580e80d
commit 54a30d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -65,4 +65,4 @@
 
 # -- Intersphinx ---------------------
 
-intersphinx_mapping = {'graphql': ('https://graphql-core-3.readthedocs.io/en/stable', None)}
+intersphinx_mapping = {"graphql": ("https://graphql-core-3.readthedocs.io/en/stable", None)}
diff --git a/src/graphql_sqlalchemy/inputs.py b/src/graphql_sqlalchemy/inputs.py
@@ -25,9 +25,12 @@
 from .types import Inputs
 
 ORDER_BY_ENUM = GraphQLEnumType("order_by", {"desc": "desc", "asc": "asc"})
-ON_CONFLICT_INPUT = GraphQLInputObjectType("on_conflict_input", {
+ON_CONFLICT_INPUT = GraphQLInputObjectType(
+    "on_conflict_input",
+    {
         "merge": GraphQLInputField(GraphQLNonNull(GraphQLBoolean)),
-})
+    },
+)
 
 
 def get_comparison_input_type(column: Column, inputs: Inputs) -> GraphQLInputObjectType:

diff --git a/src/graphql_sqlalchemy/names.py b/src/graphql_sqlalchemy/names.py
@@ -42,6 +42,10 @@ def get_model_insert_one_object_name(model: DeclarativeMeta) -> str:
     return f"insert_{get_table_name(model)}_one"
 
 
+def get_model_conflict_input_name(model: DeclarativeMeta) -> str:
+    return f"{get_table_name(model)}_on_conflict"
+
+
 def get_model_mutation_response_object_name(model: DeclarativeMeta) -> str:
     return f"{get_table_name(model)}_mutation_response"