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

!1293 pg_collation系统表升级适配

Browse Source 
Merge pull request !1293 from 薛蒙恩/collation
This commit is contained in:
opengauss-bot
2021-09-30 06:19:02 +00:00
committed by Gitee
parent 34aab162fb ccb2105621
commit d950a04bc9
5 changed files with 19 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 = 92420;
const uint32 GRAND_VERSION_NUM = 92421;
const uint32 HINT_ENHANCEMENT_VERSION_NUM = 92359;
const uint32 MATVIEW_VERSION_NUM = 92213;

5
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_421.sql Normal file
View File

@ -0,0 +1,5 @@
-- --------------------------------------------------------------
-- rollback pg_catalog.pg_collation
-- --------------------------------------------------------------
delete from pg_catalog.pg_collation where collname='zh_CN' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';
delete from pg_catalog.pg_collation where collname='zh_CN.gb18030' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';

5
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_421.sql Normal file
View File

@ -0,0 +1,5 @@
-- --------------------------------------------------------------
-- rollback pg_catalog.pg_collation
-- --------------------------------------------------------------
delete from pg_catalog.pg_collation where collname='zh_CN' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';
delete from pg_catalog.pg_collation where collname='zh_CN.gb18030' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';

4
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql Normal file
View File

@ -0,0 +1,4 @@
-- --------------------------------------------------------------
-- upgrade pg_catalog.pg_collation
-- --------------------------------------------------------------
insert into pg_catalog.pg_collation values ('zh_CN', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030'), ('zh_CN.gb18030', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030');

4
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_421.sql Normal file
View File

@ -0,0 +1,4 @@
-- --------------------------------------------------------------
-- upgrade pg_catalog.pg_collation
-- --------------------------------------------------------------
insert into pg_catalog.pg_collation values ('zh_CN', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030'), ('zh_CN.gb18030', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030');