From a80bb4e5aabc4850a202f3a4d114c543357e37d5 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 6 Jan 2016 12:40:34 -0500
Subject: - Added :class:`.mysql.JSON` for MySQL 5.7.  The JSON type provides
 persistence of JSON values in MySQL as well as basic operator support of
 "getitem" and "getpath", making use of the ``JSON_EXTRACT`` function in order
 to refer to individual paths in a JSON structure. fixes #3547 - Added a new
 type to core :class:`.types.JSON`.  This is the base of the PostgreSQL
 :class:`.postgresql.JSON` type as well as that of the new
 :class:`.mysql.JSON` type, so that a PG/MySQL-agnostic JSON column may be
 used.  The type features basic index and path searching support. fixes #3619
 - reorganization of migration docs etc. to try to refer both to the fixes to
 JSON that helps Postgresql while at the same time indicating these are new
 features of the new base JSON type. - a rework of the Array/Indexable system
 some more, moving things that are specific to Array out of Indexable. - new
 operators for JSON indexing added to core so that these can be compiled by
 the PG and MySQL dialects individually - rename sqltypes.Array to
 sqltypes.ARRAY - as there is no generic Array implementation, this is an
 uppercase type for now, consistent with the new sqltypes.JSON type that is
 also not a generic implementation. There may need to be some convention
 change to handle the case of datatypes that aren't generic, rely upon
 DB-native implementations, but aren't necessarily all named the same thing.

---
 lib/sqlalchemy/dialects/postgresql/hstore.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/sqlalchemy/dialects/postgresql/hstore.py')

diff --git a/lib/sqlalchemy/dialects/postgresql/hstore.py b/lib/sqlalchemy/dialects/postgresql/hstore.py
index b7b0fc007..d2d20386a 100644
--- a/lib/sqlalchemy/dialects/postgresql/hstore.py
+++ b/lib/sqlalchemy/dialects/postgresql/hstore.py
@@ -12,34 +12,33 @@ from .array import ARRAY
 from ... import types as sqltypes
 from ...sql import functions as sqlfunc
 from ...sql import operators
-from ...sql.operators import custom_op
 from ... import util
 
 __all__ = ('HSTORE', 'hstore')
 
 
-INDEX = custom_op(
-    "->", precedence=5, natural_self_precedent=True
+GETITEM = operators.custom_op(
+    "->", precedence=15, natural_self_precedent=True,
 )
 
 HAS_KEY = operators.custom_op(
-    "?", precedence=5, natural_self_precedent=True
+    "?", precedence=15, natural_self_precedent=True
 )
 
 HAS_ALL = operators.custom_op(
-    "?&", precedence=5, natural_self_precedent=True
+    "?&", precedence=15, natural_self_precedent=True
 )
 
 HAS_ANY = operators.custom_op(
-    "?|", precedence=5, natural_self_precedent=True
+    "?|", precedence=15, natural_self_precedent=True
 )
 
 CONTAINS = operators.custom_op(
-    "@>", precedence=5, natural_self_precedent=True
+    "@>", precedence=15, natural_self_precedent=True
 )
 
 CONTAINED_BY = operators.custom_op(
-    "<@", precedence=5, natural_self_precedent=True
+    "<@", precedence=15, natural_self_precedent=True
 )
 
 
@@ -166,7 +165,7 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
                 CONTAINED_BY, other, result_type=sqltypes.Boolean)
 
         def _setup_getitem(self, index):
-            return INDEX, index, self.type.text_type
+            return GETITEM, index, self.type.text_type
 
         def defined(self, key):
             """Boolean expression.  Test for presence of a non-NULL value for
-- 
cgit v1.2.1