From 72fd456870da99db5cc4c9e4f0c534bcb16c3d93 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff@j-davis.com>
Date: Wed, 25 May 2022 09:14:36 -0700
Subject: [PATCH] rm 11.2

---
 src/backend/distributed/Makefile              |  1 +
 .../distributed/sql/citus--11.1-1--11.2-1.sql | 39 -------------------
 .../sql/downgrades/citus--11.2-1--11.1-1.sql  | 24 ------------
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
 delete mode 100644 src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql

diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index cd88d7da7..f537d4cd8 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -16,6 +16,7 @@ generated_sql_files = $(patsubst %,$(citus_abs_srcdir)/build/%,$(template_sql_fi
 generated_downgrade_sql_files += $(patsubst %,$(citus_abs_srcdir)/build/sql/%,$(template_downgrade_sql_files))
 # All citus--*.sql files that are used to upgrade between versions
 DATA_built = $(generated_sql_files)
+
 # directories with source files
 SUBDIRS = . commands connection ddl deparser executor metadata operations planner progress relay safeclib test transaction utils worker
 # enterprise modules
diff --git a/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql b/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
deleted file mode 100644
index ccc57ef83..000000000
--- a/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
+++ /dev/null
@@ -1,39 +0,0 @@
---  bump version to 11.2-1
---  drop columnar objects if they exists in citus extension
-
-DO $check_citus$
-BEGIN
-IF EXISTS (SELECT 1 FROM pg_catalog.pg_extension AS e
-INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
-INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
-WHERE e.extname='citus' and p.proname = 'columnar_handler'
-) THEN
-ALTER EXTENSION citus DROP SCHEMA columnar;
-ALTER EXTENSION citus DROP SEQUENCE columnar.storageid_seq;
-
--- columnar tables
-ALTER EXTENSION citus DROP TABLE columnar.options;
-ALTER EXTENSION citus DROP TABLE columnar.stripe;
-ALTER EXTENSION citus DROP TABLE columnar.chunk_group;
-ALTER EXTENSION citus DROP TABLE columnar.chunk;
-
-DO $proc$
-BEGIN
--- columnar functions
-IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
-    EXECUTE $$
-        ALTER EXTENSION citus DROP FUNCTION columnar.columnar_handler;
-        ALTER EXTENSION citus DROP ACCESS METHOD columnar;
-        ALTER EXTENSION citus DROP FUNCTION pg_catalog.alter_columnar_table_set;
-        ALTER EXTENSION citus DROP FUNCTION pg_catalog.alter_columnar_table_reset;
-    $$;
-END IF;
-END$proc$;
-
--- functions under citus_internal for columnar
-ALTER EXTENSION citus DROP FUNCTION citus_internal.upgrade_columnar_storage;
-ALTER EXTENSION citus DROP FUNCTION citus_internal.downgrade_columnar_storage;
-ALTER EXTENSION citus DROP FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
-
-END IF;
-END $check_citus$;
diff --git a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql b/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql
deleted file mode 100644
index a42d24607..000000000
--- a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- add relations to citus
-ALTER EXTENSION citus ADD SCHEMA columnar;
-ALTER EXTENSION citus ADD SEQUENCE columnar.storageid_seq;
-ALTER EXTENSION citus ADD TABLE columnar.options;
-ALTER EXTENSION citus ADD TABLE columnar.stripe;
-ALTER EXTENSION citus ADD TABLE columnar.chunk_group;
-ALTER EXTENSION citus ADD TABLE columnar.chunk;
-
-DO $proc$
-BEGIN
--- columnar functions
-IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
-    EXECUTE $$
-        ALTER EXTENSION citus ADD FUNCTION columnar.columnar_handler;
-        ALTER EXTENSION citus ADD ACCESS METHOD columnar;
-        ALTER EXTENSION citus ADD FUNCTION pg_catalog.alter_columnar_table_set;
-        ALTER EXTENSION citus ADD FUNCTION pg_catalog.alter_columnar_table_reset;
-    $$;
-END IF;
-END$proc$;
-
-ALTER EXTENSION citus ADD FUNCTION citus_internal.upgrade_columnar_storage;
-ALTER EXTENSION citus ADD FUNCTION citus_internal.downgrade_columnar_storage;
-ALTER EXTENSION citus ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog;