From 3f534bba9b55cc4adb479f88c843d8e1a68a7d68 Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Wed, 2 Aug 2023 14:16:35 -0400 Subject: [PATCH] Fixes ci issues Runs rollback on domain-test --- sql/load_sql_context.sql | 14 +++++++------- test/expected/domain_field_types.out | 7 +++---- test/sql/domain_field_types.sql | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sql/load_sql_context.sql b/sql/load_sql_context.sql index bbb41e2d..e9c2d24f 100644 --- a/sql/load_sql_context.sql +++ b/sql/load_sql_context.sql @@ -36,19 +36,19 @@ select ), 'base_type_map', coalesce( ( - select + select jsonb_object_agg( - current_oid, + current_oid, base_oid ) from ( - select current_oid::int, min(base_oid::int) as base_oid - from + select current_oid::int, min(base_oid::int) as base_oid + from type_hierarchy - where + where current_oid <> base_oid group by current_oid - ) as gt + ) as gt ), jsonb_build_object() ), @@ -126,7 +126,7 @@ select on pt.typrelid = tabs.oid ), jsonb_build_object() - ), + ), 'composites', coalesce( ( select diff --git a/test/expected/domain_field_types.out b/test/expected/domain_field_types.out index d00b31ae..a5ebe771 100644 --- a/test/expected/domain_field_types.out +++ b/test/expected/domain_field_types.out @@ -168,7 +168,6 @@ begin; } (1 row) - select jsonb_pretty( graphql.resolve($$ { @@ -251,7 +250,7 @@ begin; edges { node { id - fieldInt + fieldInt } } } @@ -357,7 +356,7 @@ begin; } } } - } + } $$) ); jsonb_pretty @@ -545,4 +544,4 @@ begin; rollback to savepoint a; -- TODO: Check that update mutation resolves the base types -- TODO: Check that delete mutation resolves the base types -end; +rollback; diff --git a/test/sql/domain_field_types.sql b/test/sql/domain_field_types.sql index 4074181b..25826b55 100644 --- a/test/sql/domain_field_types.sql +++ b/test/sql/domain_field_types.sql @@ -56,7 +56,7 @@ begin; $$) ); - + select jsonb_pretty( graphql.resolve($$ { @@ -92,7 +92,7 @@ begin; edges { node { id - fieldInt + fieldInt } } } @@ -147,7 +147,7 @@ begin; } } } - } + } $$) ); @@ -195,4 +195,4 @@ begin; -- TODO: Check that update mutation resolves the base types -- TODO: Check that delete mutation resolves the base types -end; \ No newline at end of file +rollback;