hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1564 修复升级过程中_jsonb类型oid的问题

Browse Source 
Merge pull request !1564 from 胡正超/_jsonboid
This commit is contained in:
opengauss-bot
2022-03-10 06:48:06 +00:00
committed by Gitee
parent c10de5f198 9a0b705a03
commit 2a34de04b8
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/utils/init/globals.cpp
View File

@ -59,7 +59,7 @@ bool open_join_children = true;
bool will_shutdown = false;
/* hard-wired binary version number */
const uint32 GRAND_VERSION_NUM = 92603;
const uint32 GRAND_VERSION_NUM = 92604;
const uint32 PREDPUSH_SAME_LEVEL_VERSION_NUM = 92522;
const uint32 UPSERT_WHERE_VERSION_NUM = 92514;

15
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_604.sql Normal file
View File

@ -0,0 +1,15 @@
do $$
DECLARE ans boolean;
BEGIN
select case when oid = 3807 then true else false end into ans from pg_type where typname = '_jsonb';
if ans = false then
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, 3807, b;
CREATE TYPE pg_catalog.jsonb;
CREATE TYPE pg_catalog.jsonb (input=jsonb_in, output=jsonb_out, RECEIVE = jsonb_recv, SEND = jsonb_send, STORAGE=EXTENDED, category='C');
COMMENT ON TYPE pg_catalog.jsonb IS 'json binary';
COMMENT ON TYPE pg_catalog._jsonb IS 'json binary';
end if;
END
$$;

15
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_604.sql Normal file
View File

@ -0,0 +1,15 @@
do $$
DECLARE ans boolean;
BEGIN
select case when oid = 3807 then true else false end into ans from pg_type where typname = '_jsonb';
if ans = false then
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, 3807, b;
CREATE TYPE pg_catalog.jsonb;
CREATE TYPE pg_catalog.jsonb (input=jsonb_in, output=jsonb_out, RECEIVE = jsonb_recv, SEND = jsonb_send, STORAGE=EXTENDED, category='C');
COMMENT ON TYPE pg_catalog.jsonb IS 'json binary';
COMMENT ON TYPE pg_catalog._jsonb IS 'json binary';
end if;
END
$$;