From 54a30d0b2fe2d5a1eb3668f0f7bc6ec3cb366ec4 Mon Sep 17 00:00:00 2001 From: Guido Date: Fri, 16 Apr 2021 12:56:10 -0400 Subject: [PATCH] re-add name for pg dialect conflicts --- docs/source/conf.py | 2 +- src/graphql_sqlalchemy/inputs.py | 7 +++++-- src/graphql_sqlalchemy/names.py | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 95f98de..04f0421 100644 --- 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 index 2cb96d9..41ac3f5 100644 --- 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 index 45c6743..8c13201 100644 --- 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"