summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/cube/Makefile2
-rw-r--r--contrib/cube/cube--1.4--1.5.sql8
-rw-r--r--contrib/cube/cube.control2
-rw-r--r--contrib/hstore/hstore--1.7--1.8.sql4
-rw-r--r--contrib/intarray/Makefile2
-rw-r--r--contrib/intarray/intarray--1.4--1.5.sql8
-rw-r--r--contrib/intarray/intarray.control2
-rw-r--r--contrib/seg/Makefile2
-rw-r--r--contrib/seg/seg--1.3--1.4.sql8
-rw-r--r--contrib/seg/seg.control2
-rw-r--r--doc/src/sgml/cube.sgml8
-rw-r--r--doc/src/sgml/hstore.sgml10
-rw-r--r--doc/src/sgml/intarray.sgml8
-rw-r--r--doc/src/sgml/seg.sgml8
14 files changed, 34 insertions, 40 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 54f609db171..cf195506c71 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -7,7 +7,7 @@ OBJS = \
cubeparse.o
EXTENSION = cube
-DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql \
+DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql cube--1.4--1.5.sql \
cube--1.1--1.2.sql cube--1.0--1.1.sql
PGFILEDESC = "cube - multidimensional cube data type"
diff --git a/contrib/cube/cube--1.4--1.5.sql b/contrib/cube/cube--1.4--1.5.sql
new file mode 100644
index 00000000000..54492e5d181
--- /dev/null
+++ b/contrib/cube/cube--1.4--1.5.sql
@@ -0,0 +1,8 @@
+/* contrib/cube/cube--1.4--1.5.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION cube UPDATE TO '1.5'" to load this file. \quit
+
+-- Remove @ and ~
+DROP OPERATOR @ (cube, cube);
+DROP OPERATOR ~ (cube, cube);
diff --git a/contrib/cube/cube.control b/contrib/cube/cube.control
index 3e238fc9374..50427ec1170 100644
--- a/contrib/cube/cube.control
+++ b/contrib/cube/cube.control
@@ -1,6 +1,6 @@
# cube extension
comment = 'data type for multidimensional cubes'
-default_version = '1.4'
+default_version = '1.5'
module_pathname = '$libdir/cube'
relocatable = true
trusted = true
diff --git a/contrib/hstore/hstore--1.7--1.8.sql b/contrib/hstore/hstore--1.7--1.8.sql
index d80a1384658..fb450a9d6ab 100644
--- a/contrib/hstore/hstore--1.7--1.8.sql
+++ b/contrib/hstore/hstore--1.7--1.8.sql
@@ -11,3 +11,7 @@ LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE;
ALTER TYPE hstore SET (
SUBSCRIPT = hstore_subscript_handler
);
+
+-- Remove @ and ~
+DROP OPERATOR @ (hstore, hstore);
+DROP OPERATOR ~ (hstore, hstore);
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index 01faa36b107..3817c1669ab 100644
--- a/contrib/intarray/Makefile
+++ b/contrib/intarray/Makefile
@@ -12,7 +12,7 @@ OBJS = \
_intbig_gist.o
EXTENSION = intarray
-DATA = intarray--1.3--1.4.sql intarray--1.2--1.3.sql \
+DATA = intarray--1.4--1.5.sql intarray--1.3--1.4.sql intarray--1.2--1.3.sql \
intarray--1.2.sql intarray--1.1--1.2.sql \
intarray--1.0--1.1.sql
PGFILEDESC = "intarray - functions and operators for arrays of integers"
diff --git a/contrib/intarray/intarray--1.4--1.5.sql b/contrib/intarray/intarray--1.4--1.5.sql
new file mode 100644
index 00000000000..2454ebcddc2
--- /dev/null
+++ b/contrib/intarray/intarray--1.4--1.5.sql
@@ -0,0 +1,8 @@
+/* contrib/intarray/intarray--1.4--1.5.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION intarray UPDATE TO '1.5'" to load this file. \quit
+
+-- Remove @ and ~
+DROP OPERATOR @ (_int4, _int4);
+DROP OPERATOR ~ (_int4, _int4);
diff --git a/contrib/intarray/intarray.control b/contrib/intarray/intarray.control
index bbc837c5732..c3ff753e2cf 100644
--- a/contrib/intarray/intarray.control
+++ b/contrib/intarray/intarray.control
@@ -1,6 +1,6 @@
# intarray extension
comment = 'functions, operators, and index support for 1-D arrays of integers'
-default_version = '1.4'
+default_version = '1.5'
module_pathname = '$libdir/_int'
relocatable = true
trusted = true
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index f3578a86340..bb63e835067 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -7,7 +7,7 @@ OBJS = \
segparse.o
EXTENSION = seg
-DATA = seg--1.1.sql seg--1.1--1.2.sql seg--1.2--1.3.sql \
+DATA = seg--1.1.sql seg--1.1--1.2.sql seg--1.2--1.3.sql seg--1.3--1.4.sql \
seg--1.0--1.1.sql
PGFILEDESC = "seg - line segment data type"
diff --git a/contrib/seg/seg--1.3--1.4.sql b/contrib/seg/seg--1.3--1.4.sql
new file mode 100644
index 00000000000..13babddba4e
--- /dev/null
+++ b/contrib/seg/seg--1.3--1.4.sql
@@ -0,0 +1,8 @@
+/* contrib/seg/seg--1.3--1.4.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION seg UPDATE TO '1.4'" to load this file. \quit
+
+-- Remove @ and ~
+DROP OPERATOR @ (seg, seg);
+DROP OPERATOR ~ (seg, seg);
diff --git a/contrib/seg/seg.control b/contrib/seg/seg.control
index 9ac30808481..e2c6a4750fc 100644
--- a/contrib/seg/seg.control
+++ b/contrib/seg/seg.control
@@ -1,6 +1,6 @@
# seg extension
comment = 'data type for representing line segments or floating-point intervals'
-default_version = '1.3'
+default_version = '1.4'
module_pathname = '$libdir/seg'
relocatable = true
trusted = true
diff --git a/doc/src/sgml/cube.sgml b/doc/src/sgml/cube.sgml
index 3dd89bb14d7..adf8dbaa917 100644
--- a/doc/src/sgml/cube.sgml
+++ b/doc/src/sgml/cube.sgml
@@ -223,14 +223,6 @@
</table>
<para>
- (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were
- respectively called <literal>@</literal> and <literal>~</literal>. These names are still available, but are
- deprecated and will eventually be retired. Notice that the old names
- are reversed from the convention formerly followed by the core geometric
- data types!)
- </para>
-
- <para>
In addition to the above operators, the usual comparison
operators shown in <xref linkend="functions-comparison-op-table"/> are
available for type <type>cube</type>. These
diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml
index e867fcc5aee..db5779052a5 100644
--- a/doc/src/sgml/hstore.sgml
+++ b/doc/src/sgml/hstore.sgml
@@ -318,16 +318,6 @@ key =&gt; NULL
</tgroup>
</table>
- <note>
- <para>
- Prior to PostgreSQL 8.2, the containment operators <literal>@&gt;</literal>
- and <literal>&lt;@</literal> were called <literal>@</literal> and <literal>~</literal>,
- respectively. These names are still available, but are deprecated and will
- eventually be removed. Notice that the old names are reversed from the
- convention formerly followed by the core geometric data types!
- </para>
- </note>
-
<table id="hstore-func-table">
<title><type>hstore</type> Functions</title>
<tgroup cols="1">
diff --git a/doc/src/sgml/intarray.sgml b/doc/src/sgml/intarray.sgml
index af44c7b2142..dfe98279c09 100644
--- a/doc/src/sgml/intarray.sgml
+++ b/doc/src/sgml/intarray.sgml
@@ -365,14 +365,6 @@
</table>
<para>
- (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and
- <literal>&lt;@</literal> were respectively called <literal>@</literal> and <literal>~</literal>.
- These names are still available, but are deprecated and will eventually be
- retired. Notice that the old names are reversed from the convention
- formerly followed by the core geometric data types!)
- </para>
-
- <para>
The operators <literal>&amp;&amp;</literal>, <literal>@&gt;</literal> and
<literal>&lt;@</literal> are equivalent to <productname>PostgreSQL</productname>'s built-in
operators of the same names, except that they work only on integer arrays
diff --git a/doc/src/sgml/seg.sgml b/doc/src/sgml/seg.sgml
index e0dfbc76cf3..9be69e3609f 100644
--- a/doc/src/sgml/seg.sgml
+++ b/doc/src/sgml/seg.sgml
@@ -353,14 +353,6 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
</table>
<para>
- (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were
- respectively called <literal>@</literal> and <literal>~</literal>. These names are still available, but are
- deprecated and will eventually be retired. Notice that the old names
- are reversed from the convention formerly followed by the core geometric
- data types!)
- </para>
-
- <para>
In addition to the above operators, the usual comparison
operators shown in <xref linkend="functions-comparison-op-table"/> are
available for type <type>seg</type>. These operators
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-22 13:24:16 +0000