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

!3287 fix function sha2 parameter unmatch for upgrade

Browse Source 
Merge pull request !3287 from zhengxue/master_dev
This commit is contained in:
opengauss-bot
2023-03-29 09:37:19 +00:00
committed by Gitee
parent 1e4ac506d5 68d6357e54
commit 57765fee26
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_806.sql
View File

@ -1,3 +1,3 @@
DROP FUNCTION IF EXISTS pg_catalog.sha(text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha(text) CASCADE;
DROP FUNCTION IF EXISTS pg_catalog.sha1(text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha1(text) CASCADE;
DROP FUNCTION IF EXISTS pg_catalog.sha2(text, int) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha2(text, bigint) CASCADE;

2
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_806.sql
View File

@ -1,3 +1,3 @@
DROP FUNCTION IF EXISTS pg_catalog.sha(text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha(text) CASCADE;
DROP FUNCTION IF EXISTS pg_catalog.sha1(text) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha1(text) CASCADE;
DROP FUNCTION IF EXISTS pg_catalog.sha2(text, int) CASCADE; DROP FUNCTION IF EXISTS pg_catalog.sha2(text, bigint) CASCADE;

4
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_806.sql
View File

@ -18,11 +18,11 @@ comment on function PG_CATALOG.sha1(text) is 'use the sha1 algorithm to hash';
-- sha2 -- sha2
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560; SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560;
CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, int) CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, bigint)
RETURNS text RETURNS text
LANGUAGE internal LANGUAGE internal
IMMUTABLE NOT FENCED NOT SHIPPABLE IMMUTABLE NOT FENCED NOT SHIPPABLE
AS $function$sha2$function$; AS $function$sha2$function$;
comment on function PG_CATALOG.sha2(text,int) is 'use the sha2 algorithm to hash'; comment on function PG_CATALOG.sha2(text,bigint) is 'use the sha2 algorithm to hash';
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0; SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;

4
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_806.sql
View File

@ -18,11 +18,11 @@ comment on function PG_CATALOG.sha1(text) is 'use the sha1 algorithm to hash';
-- sha2 -- sha2
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560; SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560;
CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, int) CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, bigint)
RETURNS text RETURNS text
LANGUAGE internal LANGUAGE internal
IMMUTABLE NOT FENCED NOT SHIPPABLE IMMUTABLE NOT FENCED NOT SHIPPABLE
AS $function$sha2$function$; AS $function$sha2$function$;
comment on function PG_CATALOG.sha2(text,int) is 'use the sha2 algorithm to hash'; comment on function PG_CATALOG.sha2(text,bigint) is 'use the sha2 algorithm to hash';
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0; SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;