Merge pull request #92 from cybertec-postgresql/drop-compat-ops

Drop obsolete compatibility @({bigint,spoint}, smoc) operators
postgrespro · Oct 27, 2023 · 6f19a10 · 6f19a10
2 parents 42b0004 + e810f5d
commit 6f19a10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ endif
 PGS_SQL    += pgs_gist_spoint3.sql
 
 ifneq ($(USE_HEALPIX),0)
-PGS_SQL    += pgs_moc_type.sql pgs_moc_compat.sql pgs_moc_ops.sql \
+PGS_SQL    += pgs_moc_type.sql pgs_moc_ops.sql \
               pgs_moc_geo_casts.sql
 endif
 
@@ -154,7 +154,7 @@ 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
+pg_sphere--1.1.5beta2gavo--1.1.5beta4gavo.sql:
 	cat upgrade_scripts/$@.in $^ > $@
 
 pg_sphere--1.1.5beta4gavo--1.2.0.sql: pgs_moc_ops.sql.in

diff --git a/pgs_moc_compat.sql.in b/pgs_moc_compat.sql.in
diff --git a/upgrade_scripts/pg_sphere--1.3.1--1.3.2.sql.in b/upgrade_scripts/pg_sphere--1.3.1--1.3.2.sql.in
@@ -12,3 +12,7 @@ EXCEPTION
    WHEN OTHERS THEN RAISE;
 END;
 $$;
+
+-- remove legacy spellings of operators
+DROP OPERATOR IF EXISTS @(bigint, smoc);
+DROP OPERATOR IF EXISTS @(spoint, smoc);