From 22f8faf0332da357b1ce11dbc6414ab461e9aa40 Mon Sep 17 00:00:00 2001 From: xue_meng_en <1836611252@qq.com> Date: Tue, 14 Sep 2021 22:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81GB18030=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=9B=86=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/utils/init/globals.cpp | 2 +- .../rollback_catalog_maindb_92_310.sql | 14 ++++++++++++++ .../rollback_catalog_otherdb_92_310.sql | 14 ++++++++++++++ .../upgrade_catalog_maindb_92_310.sql | 14 ++++++++++++++ .../upgrade_catalog_otherdb_92_310.sql | 14 ++++++++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_310.sql create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_310.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_310.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_310.sql diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp index 637fc4e47..b1370b5c0 100644 --- a/src/common/backend/utils/init/globals.cpp +++ b/src/common/backend/utils/init/globals.cpp @@ -59,7 +59,7 @@ bool open_join_children = true; bool will_shutdown = false; /* hard-wired binary version number */ -const uint32 GRAND_VERSION_NUM = 92309; +const uint32 GRAND_VERSION_NUM = 92310; const uint32 MATVIEW_VERSION_NUM = 92213; const uint32 PARTIALPUSH_VERSION_NUM = 92087; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_310.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_310.sql new file mode 100644 index 000000000..a024e4d90 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_310.sql @@ -0,0 +1,14 @@ +-- -------------------------------------------------------------- +-- rollback pg_catalog.pg_conversion +-- -------------------------------------------------------------- +UPDATE pg_catalog.pg_conversion SET conforencoding=39 WHERE conname like 'gb18030_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=39 WHERE conname like '%_to_gb18030'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=36 WHERE conname like 'shis_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=36 WHERE conname like '%_to_sjis'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=37 WHERE conname like 'big5_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=37 WHERE conname like '%_to_big5'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=38 WHERE conname like 'uhc_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=38 WHERE conname like '%_to_uhc'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_310.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_310.sql new file mode 100644 index 000000000..a024e4d90 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_310.sql @@ -0,0 +1,14 @@ +-- -------------------------------------------------------------- +-- rollback pg_catalog.pg_conversion +-- -------------------------------------------------------------- +UPDATE pg_catalog.pg_conversion SET conforencoding=39 WHERE conname like 'gb18030_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=39 WHERE conname like '%_to_gb18030'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=36 WHERE conname like 'shis_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=36 WHERE conname like '%_to_sjis'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=37 WHERE conname like 'big5_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=37 WHERE conname like '%_to_big5'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=38 WHERE conname like 'uhc_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=38 WHERE conname like '%_to_uhc'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_310.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_310.sql new file mode 100644 index 000000000..a236d04be --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_310.sql @@ -0,0 +1,14 @@ +-- -------------------------------------------------------------- +-- upgrade pg_catalog.pg_conversion +-- -------------------------------------------------------------- +UPDATE pg_catalog.pg_conversion SET conforencoding=36 WHERE conname like 'gb18030_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=36 WHERE conname like '%_to_gb18030'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=37 WHERE conname like 'shis_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=37 WHERE conname like '%_to_sjis'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=38 WHERE conname like 'big5_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=38 WHERE conname like '%_to_big5'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=39 WHERE conname like 'uhc_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=39 WHERE conname like '%_to_uhc'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_310.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_310.sql new file mode 100644 index 000000000..a236d04be --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_310.sql @@ -0,0 +1,14 @@ +-- -------------------------------------------------------------- +-- upgrade pg_catalog.pg_conversion +-- -------------------------------------------------------------- +UPDATE pg_catalog.pg_conversion SET conforencoding=36 WHERE conname like 'gb18030_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=36 WHERE conname like '%_to_gb18030'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=37 WHERE conname like 'shis_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=37 WHERE conname like '%_to_sjis'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=38 WHERE conname like 'big5_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=38 WHERE conname like '%_to_big5'; + +UPDATE pg_catalog.pg_conversion SET conforencoding=39 WHERE conname like 'uhc_to_%'; +UPDATE pg_catalog.pg_conversion SET contoencoding=39 WHERE conname like '%_to_uhc'; \ No newline at end of file