From 1f6832d30b4342aded89e970b058f686eecfa37f Mon Sep 17 00:00:00 2001 From: gentle_hu Date: Wed, 9 Mar 2022 19:15:23 +0800 Subject: [PATCH] fix oid of _jsonb in upgrade case --- .../rollback-post_catalog_maindb_92_420.sql | 2 ++ .../rollback-post_catalog_otherdb_92_420.sql | 2 ++ .../upgrade-post_catalog_maindb_92_420.sql | 3 ++- .../upgrade-post_catalog_otherdb_92_420.sql | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql index b931b2c1a..703086996 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql @@ -254,7 +254,9 @@ BEGIN end if; END$$; +DROP TYPE IF EXISTS pg_catalog._jsonb; DROP TYPE IF EXISTS pg_catalog.jsonb; + DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql index b931b2c1a..703086996 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql @@ -254,7 +254,9 @@ BEGIN end if; END$$; +DROP TYPE IF EXISTS pg_catalog._jsonb; DROP TYPE IF EXISTS pg_catalog.jsonb; + DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql index 215dd9fc1..04eb184fc 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql @@ -1,8 +1,9 @@ -------------------------------------------------------------- -- add new type jsonb -------------------------------------------------------------- +DROP TYPE IF EXISTS pg_catalog._jsonb; DROP TYPE IF EXISTS pg_catalog.jsonb; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 3802, 0, b; +SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 3802, 3807, b; CREATE TYPE pg_catalog.jsonb; DROP FUNCTION IF EXISTS pg_catalog.jsonb_in(cstring) CASCADE; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql index 362938e5a..6bec8e58d 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql @@ -1,8 +1,9 @@ -------------------------------------------------------------- -- add new type jsonb -------------------------------------------------------------- +DROP TYPE IF EXISTS pg_catalog._jsonb; DROP TYPE IF EXISTS pg_catalog.jsonb; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 3802, 0, b; +SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 3802, 3807, b; CREATE TYPE pg_catalog.jsonb; DROP FUNCTION IF EXISTS pg_catalog.jsonb_in(cstring) CASCADE;