From 707a05b1049552e6ba903ccd81ae52c319e7eafa Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Tue, 19 Sep 2023 19:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D3.0.0-3.1.0-5.1.0=E8=B7=A8?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=81=B0=E5=BA=A6=E5=8D=87=E7=BA=A7=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=EF=BC=8C=E6=8A=A5=E9=94=99Key=20(oid)=3D(560)=20alrea?=
 =?UTF-8?q?dy=20exists?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upgrade-post_catalog_maindb_92_806.sql                      | 2 ++
 .../upgrade-post_catalog_otherdb_92_806.sql                     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_806.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_806.sql
index 1b19742ebd..706cf55061 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_806.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_806.sql
@@ -18,6 +18,8 @@ comment on function PG_CATALOG.sha1(text) is 'use the sha1 algorithm to hash';
  
 -- sha2
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560;
+DROP FUNCTION IF EXISTS pg_catalog.sha2(text, bigint) CASCADE;
+DROP FUNCTION IF EXISTS pg_catalog.sha2(text, int) CASCADE;
 CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, bigint)
  RETURNS text
  LANGUAGE internal
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_806.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_806.sql
index 1b19742ebd..706cf55061 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_806.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_806.sql
@@ -18,6 +18,8 @@ comment on function PG_CATALOG.sha1(text) is 'use the sha1 algorithm to hash';
  
 -- sha2
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 560;
+DROP FUNCTION IF EXISTS pg_catalog.sha2(text, bigint) CASCADE;
+DROP FUNCTION IF EXISTS pg_catalog.sha2(text, int) CASCADE;
 CREATE OR REPLACE FUNCTION pg_catalog.sha2(text, bigint)
  RETURNS text
  LANGUAGE internal
-- 
Gitee