mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Rename contains/contained-by operators to @> and <@, per discussion that
agreed these symbols are less easily confused. I made new pg_operator entries (with new OIDs) for the old names, so as to provide backward compatibility while making it pretty easy to remove the old names in some future release cycle. This commit only touches the core datatypes, contrib will be fixed separately.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.334 2006/09/05 21:08:33 tgl Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.335 2006/09/10 00:29:33 tgl Exp $ -->
|
||||
|
||||
<chapter id="functions">
|
||||
<title>Functions and Operators</title>
|
||||
@@ -6498,14 +6498,14 @@ SELECT pg_sleep(1.5);
|
||||
<entry><literal>lseg '((-1,0),(1,0))' ?|| lseg '((-1,2),(1,2))'</literal></entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry> <literal>~</literal> </entry>
|
||||
<entry> <literal>@></literal> </entry>
|
||||
<entry>Contains?</entry>
|
||||
<entry><literal>circle '((0,0),2)' ~ point '(1,1)'</literal></entry>
|
||||
<entry><literal>circle '((0,0),2)' @> point '(1,1)'</literal></entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry> <literal>@</literal> </entry>
|
||||
<entry> <literal><@</literal> </entry>
|
||||
<entry>Contained in or on?</entry>
|
||||
<entry><literal>point '(1,1)' @ circle '((0,0),2)'</literal></entry>
|
||||
<entry><literal>point '(1,1)' <@ circle '((0,0),2)'</literal></entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry> <literal>~=</literal> </entry>
|
||||
@@ -6516,6 +6516,15 @@ SELECT pg_sleep(1.5);
|
||||
</tgroup>
|
||||
</table>
|
||||
|
||||
<note>
|
||||
<para>
|
||||
Before <productname>PostgreSQL</productname> 8.2, the containment
|
||||
operators <literal>@></> and <literal><@</> were respectively
|
||||
called <literal>~</> and <literal>@</>. These names are still
|
||||
available, but are deprecated and will eventually be retired.
|
||||
</para>
|
||||
</note>
|
||||
|
||||
<indexterm>
|
||||
<primary>area</primary>
|
||||
</indexterm>
|
||||
@@ -7051,10 +7060,7 @@ SELECT pg_sleep(1.5);
|
||||
available for use with the <type>macaddr</type> type. The function
|
||||
<literal><function>trunc</function>(<type>macaddr</type>)</literal> returns a MAC
|
||||
address with the last 3 bytes set to zero. This can be used to
|
||||
associate the remaining prefix with a manufacturer. The directory
|
||||
<filename>contrib/mac</filename> in the source distribution
|
||||
contains some utilities to create and maintain such an association
|
||||
table.
|
||||
associate the remaining prefix with a manufacturer.
|
||||
</para>
|
||||
|
||||
<table id="macaddr-functions-table">
|
||||
@@ -7613,6 +7619,20 @@ SELECT NULLIF(value, '(none)') ...
|
||||
<entry><literal>t</literal></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry> <literal>@></literal> </entry>
|
||||
<entry>contains</entry>
|
||||
<entry><literal>ARRAY[1,4,3] @> ARRAY[3,1]</literal></entry>
|
||||
<entry><literal>t</literal></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry> <literal><@</literal> </entry>
|
||||
<entry>is contained by</entry>
|
||||
<entry><literal>ARRAY[2,7] <@ ARRAY[1,7,4,2,6]</literal></entry>
|
||||
<entry><literal>t</literal></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry> <literal>||</literal> </entry>
|
||||
<entry>array-to-array concatenation</entry>
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.59 2006/09/04 19:58:02 momjian Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.60 2006/09/10 00:29:34 tgl Exp $ -->
|
||||
|
||||
<chapter id="indexes">
|
||||
<title id="indexes-title">Indexes</title>
|
||||
@@ -225,8 +225,8 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
|
||||
<member><literal>&<|</literal></member>
|
||||
<member><literal>|&></literal></member>
|
||||
<member><literal>|>></literal></member>
|
||||
<member><literal>~</literal></member>
|
||||
<member><literal>@</literal></member>
|
||||
<member><literal>@></literal></member>
|
||||
<member><literal><@</literal></member>
|
||||
<member><literal>~=</literal></member>
|
||||
<member><literal>&&</literal></member>
|
||||
</simplelist>
|
||||
|
Reference in New Issue
Block a user