diff options
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 31 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/json.py | 7 |
2 files changed, 33 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index d6fd2623b..6d97033d0 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1559,13 +1559,36 @@ class PGCompiler(compiler.SQLCompiler): self.process(element.stop, **kw), ) - def visit_json_getitem_op_binary(self, binary, operator, **kw): + def visit_json_getitem_op_binary( + self, binary, operator, _cast_applied=False, **kw + ): + if ( + not _cast_applied + and binary.type._type_affinity is not sqltypes.JSON + ): + kw["_cast_applied"] = True + return self.process(sql.cast(binary, binary.type), **kw) + kw["eager_grouping"] = True - return self._generate_generic_binary(binary, " -> ", **kw) - def visit_json_path_getitem_op_binary(self, binary, operator, **kw): + return self._generate_generic_binary( + binary, " -> " if not _cast_applied else " ->> ", **kw + ) + + def visit_json_path_getitem_op_binary( + self, binary, operator, _cast_applied=False, **kw + ): + if ( + not _cast_applied + and binary.type._type_affinity is not sqltypes.JSON + ): + kw["_cast_applied"] = True + return self.process(sql.cast(binary, binary.type), **kw) + kw["eager_grouping"] = True - return self._generate_generic_binary(binary, " #> ", **kw) + return self._generate_generic_binary( + binary, " #> " if not _cast_applied else " #>> ", **kw + ) def visit_getitem_binary(self, binary, operator, **kw): return "%s[%s]" % ( diff --git a/lib/sqlalchemy/dialects/postgresql/json.py b/lib/sqlalchemy/dialects/postgresql/json.py index b8e3ac23d..ef48f3d86 100644 --- a/lib/sqlalchemy/dialects/postgresql/json.py +++ b/lib/sqlalchemy/dialects/postgresql/json.py @@ -123,11 +123,17 @@ class JSON(sqltypes.JSON): data_table.c.data['some key'].astext == 'some value' + Note that equivalent functionality is available via the + :attr:`.JSON.Comparator.as_string` accessor. + * Index operations with CAST (equivalent to ``CAST(col ->> ['some key'] AS <type>)``):: data_table.c.data['some key'].astext.cast(Integer) == 5 + Note that equivalent functionality is available via the + :attr:`.JSON.Comparator.as_integer` and similar accessors. + * Path index operations (the ``#>`` operator):: data_table.c.data[('key_1', 'key_2', 5, ..., 'key_n')] @@ -214,7 +220,6 @@ class JSON(sqltypes.JSON): :meth:`.ColumnElement.cast` """ - if isinstance(self.expr.right.type, sqltypes.JSON.JSONPathType): return self.expr.left.operate( JSONPATH_ASTEXT, |