From efc57764513045a4ef319d97df100614351f1736 Mon Sep 17 00:00:00 2001
From: Hanefi Onaldi <Hanefi.Onaldi@microsoft.com>
Date: Tue, 6 Jul 2021 17:09:09 +0300
Subject: [PATCH] Remove public schema dependency for 10.1 upgrades

This commit contains a subset of the changes that should be cherry
picked to 10.1 releases.
---
 src/backend/distributed/sql/citus--10.0-4--10.1-1.sql       | 2 +-
 ...{citus--10.1-1--10.0-3.sql => citus--10.1-1--10.0-4.sql} | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename src/backend/distributed/sql/downgrades/{citus--10.1-1--10.0-3.sql => citus--10.1-1--10.0-4.sql} (95%)

diff --git a/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql b/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
index ec5a122fa..1b9b32e34 100644
--- a/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
+++ b/src/backend/distributed/sql/citus--10.0-4--10.1-1.sql
@@ -1,4 +1,4 @@
--- citus--10.0-3--10.1-1
+-- citus--10.0-4--10.1-1
 
 -- add the current database to the distributed objects if not already in there.
 -- this is to reliably propagate some of the alter database commands that might be
diff --git a/src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-3.sql b/src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-4.sql
similarity index 95%
rename from src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-3.sql
rename to src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-4.sql
index 5946473f9..10fb10593 100644
--- a/src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-3.sql
+++ b/src/backend/distributed/sql/downgrades/citus--10.1-1--10.0-4.sql
@@ -1,4 +1,8 @@
--- citus--10.1-1--10.0-3
+-- citus--10.1-1--10.0-4
+
+-- This migration file aims to fix the issues with upgrades on clusters without public schema.
+
+-- copy of citus--10.1-1--10.0-3
 
 -- remove databases as distributed objects to prevent unknown object types being managed
 -- on older versions.