Skip to content

Commit

Permalink
Remove support from upgrading from pre-1.2.0 versions
Browse files Browse the repository at this point in the history
Before 1.2, there was a mess of 1.1_datestamp and 1.1gavo versions.
Remove that version number maze, existing users should already be on
1.2, or can upgrade to 1.2/1.3 before deploying later versions.
  • Loading branch information
df7cb committed Oct 6, 2023
1 parent d7f8314 commit 7462c09
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 216 deletions.
47 changes: 0 additions & 47 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \
endif

DATA_built = $(RELEASE_SQL) \
pg_sphere--1.0--1.0_gavo.sql \
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql \
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql \
pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql \
pg_sphere--1.1.5beta4gavo--1.2.0.sql \
pg_sphere--1.2.0--1.2.1.sql \
pg_sphere--1.2.1--1.2.2.sql \
pg_sphere--1.2.2--1.2.3.sql \
Expand Down Expand Up @@ -117,55 +112,13 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
$(RELEASE_SQL): pg_sphere_head.sql.in $(addsuffix .in, $(PGS_SQL))
cat $^ > $@

# default 1.0 (after 2016-02-07) -> 1.1.5
UPGRADE_1_0_PRE_xxxxxx = contains-ops-fixes-2.sql
# '1.1.5_from_2015-08-31'
AUGMENT_1_0_PRE_AAF2D5 = pgs_contains_ops.sql gnomo.sql
UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \
pgs_gist_contains_ops.sql

# add new HEALPix functions and experimental spoint3
ifneq ($(USE_HEALPIX),0)
AUGMENT_FROM_GAVO = healpix.sql
endif
AUGMENT_FROM_GAVO += pgs_gist_spoint3.sql

AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO)
UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql

# test installation B (generic)
pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names
cat upgrade_scripts/$@.in > $@
pg_sphere--1.0_gavo--1.1.5beta0gavo.sql: $(addsuffix .in, \
$(AUGMENT_1_0_115B0G) \
$(addprefix upgrade_scripts/, $(UPGRADE_1_0_115B0G)))
cat upgrade_scripts/$@.in $^ > $@

ifneq ($(USE_HEALPIX),0)
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql: pgs_moc_type.sql.in
cat upgrade_scripts/$@.in $^ > $@

pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql: pgs_moc_compat.sql.in
cat upgrade_scripts/$@.in $^ > $@

pg_sphere--1.1.5beta4gavo--1.2.0.sql: pgs_moc_ops.sql.in
cat upgrade_scripts/$@.in $^ > $@

pg_sphere--1.2.0--1.2.1.sql: pgs_moc_geo_casts.sql.in pgs_epochprop.sql.in
cat upgrade_scripts/$@.in $^ > $@

pg_sphere--1.2.1--1.2.2.sql: upgrade_scripts/pg_sphere--1.2.1--1.2.2-healpix.sql.in
cat upgrade_scripts/$@.in $^ > $@
else
pg_sphere--1.1.5beta0gavo--1.1.5beta2gavo.sql:
cat upgrade_scripts/$@.in > $@

pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql:
cat upgrade_scripts/$@.in > $@

pg_sphere--1.1.5beta4gavo--1.2.0.sql:
cat upgrade_scripts/$@.in > $@

pg_sphere--1.2.0--1.2.1.sql: pgs_epochprop.sql.in
cat upgrade_scripts/$@.in $^ > $@

Expand Down
39 changes: 0 additions & 39 deletions upgrade_scripts/contains-ops-fixes-1.sql.in

This file was deleted.

26 changes: 0 additions & 26 deletions upgrade_scripts/contains-ops-fixes-2.sql.in

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.0--1.0_gavo.sql.in

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.0--1.1.5_from_2015-08-31.sql.in

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.0--1.1.5_from_2016-02-07.sql.in

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.0_gavo--1.1.5beta0gavo.sql.in

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.1.5--1.1.5.1.sql.in

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions upgrade_scripts/pg_sphere--1.1.5beta4gavo--1.2.0.sql.in

This file was deleted.

73 changes: 0 additions & 73 deletions upgrade_scripts/pgs_gist_contains_ops.sql.in

This file was deleted.

11 changes: 0 additions & 11 deletions upgrade_scripts/pgs_gist_drop_spoint2.sql.in

This file was deleted.

0 comments on commit 7462c09

Please sign in to comment.