git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix bogus commutator/negator links for JSONB containment operators.

2014年8月16日 16:53:54 +0000 (12:53 -0400)

<@ and @> are each other's commutators, but they were incorrectly marked
as being each other's negators instead. (This was actually questioned
in a comment in the original commit, but nobody followed through :-(.)
Per bug #11178 from Christian Pronovost.

In passing, fix some JSONB operator descriptions that were randomly
different from the phrasing of every other similar description.

catversion bump for pg_catalog contents change.

src/include/catalog/catversion.h patch | blob | blame | history

src/include/catalog/pg_operator.h patch | blob | blame | history

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index cdb276a21b14036b2b1b4f26f6eb1be3a23eb919..3a7a553980e0fc48ddac5dbf6f3fe8f5de432d9d 100644 (file)

--- a/src/include/catalog/catversion.h

+++ b/src/include/catalog/catversion.h

@@ -53,6 +53,6 @@

/* yyyymmddN */

-#define CATALOG_VERSION_NO 201408141

+#define CATALOG_VERSION_NO 201408162

#endif

diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h

index f8b4a65b993532771904367712b640e169a714d7..d7dcd1c23af47d805c8abc4f1b5ea220ec758af3 100644 (file)

--- a/src/include/catalog/pg_operator.h

+++ b/src/include/catalog/pg_operator.h

@@ -1792,11 +1792,10 @@ DESCR("less than");

DATA(insert OID = 3243 ( ">" PGNSP PGUID b f f 3802 3802 16 3242 3244 jsonb_gt scalargtsel scalargtjoinsel ));

DESCR("greater than");

DATA(insert OID = 3244 ( "<=" PGNSP PGUID b f f 3802 3802 16 3245 3243 jsonb_le scalarltsel scalarltjoinsel ));

-DESCR("less than or equal to");

+DESCR("less than or equal");

DATA(insert OID = 3245 ( ">=" PGNSP PGUID b f f 3802 3802 16 3244 3242 jsonb_ge scalargtsel scalargtjoinsel ));

-DESCR("greater than or equal to");

-/* No commutator? */

-DATA(insert OID = 3246 ( "@>" PGNSP PGUID b f f 3802 3802 16 0 3250 jsonb_contains contsel contjoinsel ));

+DESCR("greater than or equal");

+DATA(insert OID = 3246 ( "@>" PGNSP PGUID b f f 3802 3802 16 3250 0 jsonb_contains contsel contjoinsel ));

DESCR("contains");

DATA(insert OID = 3247 ( "?" PGNSP PGUID b f f 3802 25 16 0 0 jsonb_exists contsel contjoinsel ));

DESCR("exists");

@@ -1804,8 +1803,8 @@ DATA(insert OID = 3248 ( "?|" PGNSP PGUID b f f 3802 1009 16 0 0 jsonb_exist

DESCR("exists any");

DATA(insert OID = 3249 ( "?&" PGNSP PGUID b f f 3802 1009 16 0 0 jsonb_exists_all contsel contjoinsel ));

DESCR("exists all");

-DATA(insert OID = 3250 ( "<@" PGNSP PGUID b f f 3802 3802 16 0 3246 jsonb_contained contsel contjoinsel ));

-DESCR("contained");

+DATA(insert OID = 3250 ( "<@" PGNSP PGUID b f f 3802 3802 16 3246 0 jsonb_contained contsel contjoinsel ));

+DESCR("is contained by");

* function prototypes

This is the main PostgreSQL git repository.

RSS Atom