Skip to content

Commit d7f8314

Browse files
committed
Drop support for "create extension from unpackaged"
PG 13 drops support for "create extension from old_version". Remove support for "from unpackaged". Existing users will likely have converted to an extension-style install years ago.
1 parent 94c0b35 commit d7f8314

File tree

4 files changed

+0
-59
lines changed

4 files changed

+0
-59
lines changed

Makefile

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
2020
endif
2121

2222
DATA_built = $(RELEASE_SQL) \
23-
pg_sphere--unpackaged--1.1.5beta0gavo.sql \
2423
pg_sphere--1.0--1.0_gavo.sql \
2524
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql \
2625
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql \
@@ -118,69 +117,22 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
118117
$(RELEASE_SQL): pg_sphere_head.sql.in $(addsuffix .in, $(PGS_SQL))
119118
cat $^ > $@
120119

121-
# for "create extension from unpacked*":
122-
123-
UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
124-
pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
125-
pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql \
126-
pgs_gist_contains_ops.sql contains-ops-fixes-1.sql
127-
128-
AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql \
129-
gnomo.sql
130-
# for vanilla 1.1.1 users:
131-
AUGMENT_UNP_111 = $(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql
132-
133-
# for 1.1.2+ users: 'from unpacked_1.1.2plus'
134-
AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON)
135-
UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in
136-
137-
# for "alter extension":
138-
139-
# TODO: add dynamic pl/pgsql to do perform an additional
140-
# "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';"
141-
# if required.
142-
#
143120
# default 1.0 (after 2016-02-07) -> 1.1.5
144121
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
145122
# '1.1.5_from_2015-08-31'
146123
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
147124
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
148125
pgs_gist_contains_ops.sql
149126

150-
# vanilla 'create from unpackaged' must assume 1.1.1
151-
# ...
152-
153-
# create "create extension from unpacked*" files
154-
155-
# create "alter extension" files
156-
157-
# local stuff follows here
158-
AUGMENT_GAVO_111 = $(AUGMENT_UNP_111) # for vanilla 1.1.1 users
159-
ifneq ($(USE_HEALPIX),0)
160-
AUGMENT_GAVO_111 += healpix.sql
161-
endif
162-
UPGRADE_GAVO_111 = $(UPGRADE_UNP_COMMON)
163-
164127
# add new HEALPix functions and experimental spoint3
165128
ifneq ($(USE_HEALPIX),0)
166129
AUGMENT_FROM_GAVO = healpix.sql
167130
endif
168131
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql
169132

170-
AUGMENT_UNP_115B0G = $(AUGMENT_UNP_111) $(AUGMENT_FROM_GAVO)
171-
UPGRADE_UNP_115B0G = $(UPGRADE_UNP_COMMON)
172-
173133
AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO)
174134
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql
175135

176-
# test installation 0
177-
pg_sphere--unpackaged--1.1.5beta0gavo.sql: $(addsuffix .in, \
178-
$(AUGMENT_GAVO_111) \
179-
$(addprefix upgrade_scripts/, $(UPGRADE_GAVO_111)))
180-
cat upgrade_scripts/$@.in $^ > $@
181-
182-
# (The upgrade of test installation A has been completed.)
183-
184136
# test installation B (generic)
185137
pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names
186138
cat upgrade_scripts/$@.in > $@

upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

upgrade_scripts/pgs_pre111.sql.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)