From 17c2d286a8af13abe651a483b979b476b34aca7b Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 4 Oct 2023 17:11:53 +0200 Subject: [PATCH 1/3] Simplify moc test handling in Makefile Remove has_explain_summary since it's only relevant with PG 9.x; move all the if(USE_HEALPIX) sections into one. --- Makefile | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index a79d720..f08a552 100644 --- a/Makefile +++ b/Makefile @@ -38,18 +38,10 @@ REGRESS = init tables points euler circle line ellipse poly path box index \ contains_ops contains_ops_compat bounding_box_gist gnomo epochprop \ contains overlaps spoint_brin sbox_brin -ifneq ($(USE_HEALPIX),0) -REGRESS += healpix moc mocautocast -endif - TESTS = init_test tables points euler circle line ellipse poly path box \ index contains_ops contains_ops_compat bounding_box_gist gnomo \ epochprop contains overlaps spoint_brin sbox_brin -ifneq ($(USE_HEALPIX),0) -TESTS += healpix moc mocautocast -endif - PG_CFLAGS += -DPGSPHERE_VERSION=$(PGSPHERE_VERSION) PG_CPPFLAGS += -DPGSPHERE_VERSION=$(PGSPHERE_VERSION) @@ -70,6 +62,8 @@ PGS_SQL = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \ pgs_gist.sql gnomo.sql pgs_brin.sql ifneq ($(USE_HEALPIX),0) +REGRESS += healpix moc moc1 moc100 mocautocast +TESTS += healpix moc moc1 moc100 mocautocast PGS_SQL += healpix.sql endif @@ -109,17 +103,10 @@ healpix_bare/healpix_bare.o : healpix_bare/healpix_bare.c $(COMPILE.c) -Wno-declaration-after-statement -o $@ $^ pg_version := $(word 2,$(shell $(PG_CONFIG) --version)) -has_explain_summary = $(if $(filter-out 9.%,$(pg_version)),y,n) crushtest: REGRESS += $(CRUSH_TESTS) crushtest: installcheck -ifneq ($(USE_HEALPIX),0) -ifeq ($(has_explain_summary),y) - REGRESS += moc1 moc100 -endif -endif - test: pg_sphere.test.sql $(pg_regress_installcheck) --temp-instance=tmp_check $(REGRESS_OPTS) $(TESTS) From b367b8c95fcedb751e0e2406d51bc0cfadbdfdd7 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 4 Oct 2023 17:33:13 +0200 Subject: [PATCH 2/3] 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. --- Makefile | 48 ------------------- .../pg_sphere--unpackaged--1.1.5.sql.in | 2 - ..._sphere--unpackaged--1.1.5beta0gavo.sql.in | 2 - upgrade_scripts/pgs_pre111.sql.in | 7 --- 4 files changed, 59 deletions(-) delete mode 100644 upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in delete mode 100644 upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in delete mode 100644 upgrade_scripts/pgs_pre111.sql.in diff --git a/Makefile b/Makefile index f08a552..5f428ea 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ OBJS += src/healpix.o src/moc.o src/process_moc.o \ endif DATA_built = $(RELEASE_SQL) \ - pg_sphere--unpackaged--1.1.5beta0gavo.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 \ @@ -116,28 +115,6 @@ pg_sphere.test.sql: $(RELEASE_SQL) $(shlib) $(RELEASE_SQL): pg_sphere_head.sql.in $(addsuffix .in, $(PGS_SQL)) cat $^ > $@ -# for "create extension from unpacked*": - -UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \ - pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \ - pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql \ - pgs_gist_contains_ops.sql contains-ops-fixes-1.sql - -AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql \ - gnomo.sql -# for vanilla 1.1.1 users: -AUGMENT_UNP_111 = $(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql - -# for 1.1.2+ users: 'from unpacked_1.1.2plus' -AUGMENT_UNP_FOR_112plus = $(AUGMENT_UNP_COMMON) -UPGRADE_UNP_FOR_112plus = pgs_gist_pointkey.sql pgs_gist_drop_spoint2.sql.in - -# for "alter extension": - -# TODO: add dynamic pl/pgsql to do perform an additional -# "ALTER EXTENSION pg_sphere UPDATE TO '1.1.5_from_before_2016-02-07';" -# if required. -# # 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' @@ -145,40 +122,15 @@ 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 -# vanilla 'create from unpackaged' must assume 1.1.1 -# ... - -# create "create extension from unpacked*" files - -# create "alter extension" files - -# local stuff follows here -AUGMENT_GAVO_111 = $(AUGMENT_UNP_111) # for vanilla 1.1.1 users -ifneq ($(USE_HEALPIX),0) -AUGMENT_GAVO_111 += healpix.sql -endif -UPGRADE_GAVO_111 = $(UPGRADE_UNP_COMMON) - # 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_UNP_115B0G = $(AUGMENT_UNP_111) $(AUGMENT_FROM_GAVO) -UPGRADE_UNP_115B0G = $(UPGRADE_UNP_COMMON) - AUGMENT_1_0_115B0G = $(AUGMENT_FROM_GAVO) UPGRADE_1_0_115B0G = contains-ops-fixes-2.sql pgs_gist_drop_spoint2.sql -# test installation 0 -pg_sphere--unpackaged--1.1.5beta0gavo.sql: $(addsuffix .in, \ - $(AUGMENT_GAVO_111) \ - $(addprefix upgrade_scripts/, $(UPGRADE_GAVO_111))) - cat upgrade_scripts/$@.in $^ > $@ - -# (The upgrade of test installation A has been completed.) - # test installation B (generic) pg_sphere--1.0--1.0_gavo.sql: # dummy upgrade to allow for descriptive names cat upgrade_scripts/$@.in > $@ diff --git a/upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in b/upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in deleted file mode 100644 index 450e6b7..0000000 --- a/upgrade_scripts/pg_sphere--unpackaged--1.1.5.sql.in +++ /dev/null @@ -1,2 +0,0 @@ --- complain if this upgrade script is run via psql -\echo Use "CREATE EXTENSION pg_sphere FROM unpackaged" to load this file. \quit diff --git a/upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in b/upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in deleted file mode 100644 index 450e6b7..0000000 --- a/upgrade_scripts/pg_sphere--unpackaged--1.1.5beta0gavo.sql.in +++ /dev/null @@ -1,2 +0,0 @@ --- complain if this upgrade script is run via psql -\echo Use "CREATE EXTENSION pg_sphere FROM unpackaged" to load this file. \quit diff --git a/upgrade_scripts/pgs_pre111.sql.in b/upgrade_scripts/pgs_pre111.sql.in deleted file mode 100644 index 33a98ae..0000000 --- a/upgrade_scripts/pgs_pre111.sql.in +++ /dev/null @@ -1,7 +0,0 @@ --- versions before 2009-11-01 (i.e., release 1.1.1.) lack pg_sphere_version(), --- see https://postgrespro.ru/list/id/20091101150558.9B87B1073FEE@pgfoundry.org - -CREATE OR REPLACE FUNCTION pg_sphere_version() - RETURNS CSTRING - AS 'MODULE_PATHNAME', 'pg_sphere_version' - LANGUAGE 'c'; From bcfbd46a3d675f9196ddbf061fb6aa1d0913c7f6 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 4 Oct 2023 16:03:54 +0000 Subject: [PATCH 3/3] Remove ancient "alter extension add" files --- upgrade_scripts/pgs_box.sql.in | 95 -------------- upgrade_scripts/pgs_circle.sql.in | 31 ----- .../pgs_contains_ops_compat.sql.in | 120 ------------------ upgrade_scripts/pgs_ellipse.sql.in | 55 -------- upgrade_scripts/pgs_euler.sql.in | 23 ---- upgrade_scripts/pgs_gist.sql.in | 27 ---- upgrade_scripts/pgs_line.sql.in | 41 ------ upgrade_scripts/pgs_path.sql.in | 67 ---------- upgrade_scripts/pgs_point.sql.in | 14 -- upgrade_scripts/pgs_polygon.sql.in | 68 ---------- upgrade_scripts/pgs_types.sql.in | 24 ---- 11 files changed, 565 deletions(-) delete mode 100644 upgrade_scripts/pgs_box.sql.in delete mode 100644 upgrade_scripts/pgs_circle.sql.in delete mode 100644 upgrade_scripts/pgs_contains_ops_compat.sql.in delete mode 100644 upgrade_scripts/pgs_ellipse.sql.in delete mode 100644 upgrade_scripts/pgs_euler.sql.in delete mode 100644 upgrade_scripts/pgs_gist.sql.in delete mode 100644 upgrade_scripts/pgs_line.sql.in delete mode 100644 upgrade_scripts/pgs_path.sql.in delete mode 100644 upgrade_scripts/pgs_point.sql.in delete mode 100644 upgrade_scripts/pgs_polygon.sql.in delete mode 100644 upgrade_scripts/pgs_types.sql.in diff --git a/upgrade_scripts/pgs_box.sql.in b/upgrade_scripts/pgs_box.sql.in deleted file mode 100644 index 3c259c5..0000000 --- a/upgrade_scripts/pgs_box.sql.in +++ /dev/null @@ -1,95 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION sbox(spoint, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sw(sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION se(sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION nw(sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION ne(sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION area(sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION circum(sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_equal(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR =(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_com(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_neg(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_com_neg(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_box(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_box_neg(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_com(spoint, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_com_neg(spoint, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point(sbox, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_neg(sbox, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_com(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_neg(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_com_neg(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_com(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_neg(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_com_neg(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_com(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_neg(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_com_neg(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line(sbox, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_com(sline, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_neg(sbox, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_com_neg(sline, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line(sbox, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_com(sline, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_neg(sbox, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_com_neg(sline, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_com(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_neg(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_com_neg(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_com(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_neg(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_com_neg(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_com(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_neg(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_com_neg(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_com(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_neg(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_com_neg(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_com(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_neg(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_com_neg(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_com(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_neg(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_com_neg(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path(sbox, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_com(spath, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_neg(sbox, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_com_neg(spath, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path(sbox, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_com(spath, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sbox); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_neg(sbox, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_com_neg(spath, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sbox); diff --git a/upgrade_scripts/pgs_circle.sql.in b/upgrade_scripts/pgs_circle.sql.in deleted file mode 100644 index ddd2ab8..0000000 --- a/upgrade_scripts/pgs_circle.sql.in +++ /dev/null @@ -1,31 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION area(scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION radius(scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle(spoint, float8); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_equal(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR =(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_equal_neg(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_neg(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION center(scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @@(NONE, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION circum(scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contained_by_circle(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle(spoint, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_neg(spoint, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_com(scircle, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_com_neg(scircle, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION dist(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR <->(scircle, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION dist(scircle, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR <->(scircle, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION dist(spoint, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR <->(spoint, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_circle(scircle, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(scircle, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_circle_inverse(scircle, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(scircle, strans); diff --git a/upgrade_scripts/pgs_contains_ops_compat.sql.in b/upgrade_scripts/pgs_contains_ops_compat.sql.in deleted file mode 100644 index d0e9c22..0000000 --- a/upgrade_scripts/pgs_contains_ops_compat.sql.in +++ /dev/null @@ -1,120 +0,0 @@ -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sline, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sline, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spath, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spath, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, sbox); -ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, sbox); diff --git a/upgrade_scripts/pgs_ellipse.sql.in b/upgrade_scripts/pgs_ellipse.sql.in deleted file mode 100644 index 77e2d77..0000000 --- a/upgrade_scripts/pgs_ellipse.sql.in +++ /dev/null @@ -1,55 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(spoint, float8, float8, float8); -ALTER EXTENSION pg_sphere ADD FUNCTION inc(sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION lrad(sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION srad(sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle(sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION strans(sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION center(sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR @@(NONE, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_equal(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR =(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_equal_neg(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_com(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_neg(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_com_neg(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_ellipse(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_ellipse_neg(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point(sellipse, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_com(spoint, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_neg(sellipse, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_com_neg(spoint, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_ellipse(sellipse, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(sellipse, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(sellipse, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_com(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_neg(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_com_neg(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_com(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_neg(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_com_neg(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_com(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_neg(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_com_neg(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_line_com(sline, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_line_com_neg(sline, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line(sellipse, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_com(sline, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_neg(sellipse, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_com_neg(sline, sellipse); diff --git a/upgrade_scripts/pgs_euler.sql.in b/upgrade_scripts/pgs_euler.sql.in deleted file mode 100644 index 8ed4ca4..0000000 --- a/upgrade_scripts/pgs_euler.sql.in +++ /dev/null @@ -1,23 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION strans_zxz(strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans(FLOAT8, FLOAT8, FLOAT8); -ALTER EXTENSION pg_sphere ADD FUNCTION strans(FLOAT8, FLOAT8, FLOAT8, CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION phi(strans); -ALTER EXTENSION pg_sphere ADD FUNCTION theta(strans); -ALTER EXTENSION pg_sphere ADD FUNCTION psi(strans); -ALTER EXTENSION pg_sphere ADD FUNCTION axes(strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_equal(strans, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR =(strans, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_not_equal(strans, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(strans, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans(strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(NONE, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_invert(strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_point(spoint, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(spoint, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_point_inverse(spoint, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(spoint, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_trans(strans, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(strans, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_trans_inv(strans, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(strans, strans); diff --git a/upgrade_scripts/pgs_gist.sql.in b/upgrade_scripts/pgs_gist.sql.in deleted file mode 100644 index aaa0e4e..0000000 --- a/upgrade_scripts/pgs_gist.sql.in +++ /dev/null @@ -1,27 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION spherekey_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION spherekey_out(spherekey); -ALTER EXTENSION pg_sphere ADD TYPE spherekey; -ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_decompress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_union(bytea, internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_picksplit(internal, internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spoint_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spoint_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spoint USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_scircle_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_scircle_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS scircle USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_sline_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_sline_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sline USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_sellipse_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_sellipse_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sellipse USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_spoly_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spoly_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spoly USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_spath_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_spath_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spath USING gist; -ALTER EXTENSION pg_sphere ADD FUNCTION g_sbox_compress(internal); -ALTER EXTENSION pg_sphere ADD FUNCTION g_sbox_consistent(internal, internal, int4, oid, internal); -ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sbox USING gist; diff --git a/upgrade_scripts/pgs_line.sql.in b/upgrade_scripts/pgs_line.sql.in deleted file mode 100644 index 3e9c6ce..0000000 --- a/upgrade_scripts/pgs_line.sql.in +++ /dev/null @@ -1,41 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION sline(spoint, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sline(strans, float8); -ALTER EXTENSION pg_sphere ADD FUNCTION meridian(float8); -ALTER EXTENSION pg_sphere ADD FUNCTION sl_beg(sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sl_end(sline); -ALTER EXTENSION pg_sphere ADD FUNCTION strans(sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_equal(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR =(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_equal_neg(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION length(sline); -ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION swap(sline); -ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION turn(sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !(NONE, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_crosses(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR #(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_crosses_neg(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !#(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_neg(sline, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_line(sline, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(sline, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_line_inverse(sline, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(sline, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle(sline, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_com(scircle, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_neg(sline, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_com_neg(scircle, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line(scircle, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_com(sline, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_neg(scircle, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_com_neg(sline, scircle); diff --git a/upgrade_scripts/pgs_path.sql.in b/upgrade_scripts/pgs_path.sql.in deleted file mode 100644 index e40b445..0000000 --- a/upgrade_scripts/pgs_path.sql.in +++ /dev/null @@ -1,67 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION npoints(spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint(spath, int4); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint(spath, float8); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_equal(spath, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR =(spath, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_equal_neg(spath, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(spath, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION length(spath); -ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION swap(spath); -ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_path(spath, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_path_neg(spath, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point(spath, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_com(spoint, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_neg(spath, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_com_neg(spoint, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_path(spath, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(spath, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_path_inverse(spath, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(spath, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path(scircle, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_com(spath, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_neg(scircle, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_com_neg(spath, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path(scircle, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_com(spath, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_neg(scircle, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_com_neg(spath, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line(spath, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_com(sline, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_neg(spath, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_com_neg(sline, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path(sellipse, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_com(spath, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_neg(sellipse, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_com_neg(spath, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path(sellipse, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_com(spath, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_neg(sellipse, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_com_neg(spath, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path(spoly, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_com(spath, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_neg(spoly, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_com_neg(spath, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path(spoly, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_com(spath, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_neg(spoly, spath); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, spath); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_com_neg(spath, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, spoly); diff --git a/upgrade_scripts/pgs_point.sql.in b/upgrade_scripts/pgs_point.sql.in deleted file mode 100644 index 754128f..0000000 --- a/upgrade_scripts/pgs_point.sql.in +++ /dev/null @@ -1,14 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION spoint(FLOAT8, FLOAT8); -ALTER EXTENSION pg_sphere ADD FUNCTION set_sphere_output_precision(INT4); -ALTER EXTENSION pg_sphere ADD FUNCTION set_sphere_output(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION long(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION lat(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION x(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION y(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION xyz(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION z(spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_equal(spoint, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR =(spoint, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(spoint, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION dist(spoint, spoint); -ALTER EXTENSION pg_sphere ADD OPERATOR <->(spoint, spoint); diff --git a/upgrade_scripts/pgs_polygon.sql.in b/upgrade_scripts/pgs_polygon.sql.in deleted file mode 100644 index 6a76b2f..0000000 --- a/upgrade_scripts/pgs_polygon.sql.in +++ /dev/null @@ -1,68 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION npoints(spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION area(spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_equal(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR =(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_not_equal(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR <>(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION circum(spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_com(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_neg(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_com_neg(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_polygon(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_polygon_neg(spoly, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point(spoly, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_com(spoint, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_neg(spoly, spoint); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_com_neg(spoint, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_poly(spoly, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR +(spoly, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_poly_inverse(spoly, strans); -ALTER EXTENSION pg_sphere ADD OPERATOR -(spoly, strans); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_com(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_neg(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_com_neg(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_com(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_neg(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_com_neg(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_com(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_neg(spoly, scircle); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, scircle); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_com_neg(scircle, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line(spoly, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_com(sline, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_neg(spoly, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_com_neg(sline, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line(spoly, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_com(sline, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_neg(spoly, sline); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sline); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_com_neg(sline, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_com(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_neg(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_com_neg(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_com(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_neg(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_com_neg(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_com(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_neg(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sellipse); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_com_neg(sellipse, spoly); -ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, spoly); diff --git a/upgrade_scripts/pgs_types.sql.in b/upgrade_scripts/pgs_types.sql.in deleted file mode 100644 index 95378a0..0000000 --- a/upgrade_scripts/pgs_types.sql.in +++ /dev/null @@ -1,24 +0,0 @@ -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION spoint_out(spoint); -ALTER EXTENSION pg_sphere ADD TYPE spoint; -ALTER EXTENSION pg_sphere ADD FUNCTION strans_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION strans_out(strans); -ALTER EXTENSION pg_sphere ADD TYPE strans; -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION scircle_out(scircle); -ALTER EXTENSION pg_sphere ADD TYPE scircle; -ALTER EXTENSION pg_sphere ADD FUNCTION sline_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION sline_out(sline); -ALTER EXTENSION pg_sphere ADD TYPE sline; -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_out(sellipse); -ALTER EXTENSION pg_sphere ADD TYPE sellipse; -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION spoly_out(spoly); -ALTER EXTENSION pg_sphere ADD TYPE spoly; -ALTER EXTENSION pg_sphere ADD FUNCTION spath_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION spath_out(spath); -ALTER EXTENSION pg_sphere ADD TYPE spath; -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_in(CSTRING); -ALTER EXTENSION pg_sphere ADD FUNCTION sbox_out(sbox); -ALTER EXTENSION pg_sphere ADD TYPE sbox;