!1574 修复升级场景下_jsonb类型oid随机分配的问题

Merge pull request !1574 from 胡正超/jsonboid2.1.0

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;

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;

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;

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;