From 9985b86d8404d84fd8e06f5ea19332d121f31262 Mon Sep 17 00:00:00 2001 From: totaj Date: Sat, 8 Jul 2023 16:34:53 +0800 Subject: [PATCH] Fix upgrade/rollback from 3.1.0 --- .../rollback-post_catalog_maindb_92_830.sql | 9 ++++++++- .../rollback-post_catalog_otherdb_92_830.sql | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_830.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_830.sql index 8baf70b47..d1593572f 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_830.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_830.sql @@ -1 +1,8 @@ -drop extension if exists dolphin; \ No newline at end of file +DO $$ +BEGIN + -- 92780 is openGauss 3.1.0, which has dolphin, so should not drop it. + if working_version_num() < 92780 then + drop extension if exists dolphin; + end if; +END +$$; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_830.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_830.sql index 8baf70b47..d1593572f 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_830.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_830.sql @@ -1 +1,8 @@ -drop extension if exists dolphin; \ No newline at end of file +DO $$ +BEGIN + -- 92780 is openGauss 3.1.0, which has dolphin, so should not drop it. + if working_version_num() < 92780 then + drop extension if exists dolphin; + end if; +END +$$;