diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-01 10:35:30 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-01 12:34:41 -0400 |
| commit | 919b8bc4acf8de4720e8fff5077557f366fb3fb0 (patch) | |
| tree | fd515dc511a722b8a464c2c851cb59ddb4bda907 /lib/sqlalchemy/sql/default_comparator.py | |
| parent | 65680b2343ef421a62582e23e2b35293732933ad (diff) | |
| download | sqlalchemy-919b8bc4acf8de4720e8fff5077557f366fb3fb0.tar.gz | |
Ensure custom ops have consistent typing behavior, boolean support
Refined the behavior of :meth:`.Operators.op` such that in all cases,
if the :paramref:`.Operators.op.is_comparison` flag is set to True,
the return type of the resulting expression will be
:class:`.Boolean`, and if the flag is False, the return type of the
resulting expression will be the same type as that of the left-hand
expression, which is the typical default behavior of other operators.
Also added a new parameter :paramref:`.Operators.op.return_type` as well
as a helper method :meth:`.Operators.bool_op`.
Change-Id: Ifc8553cd4037d741b84b70a9702cbd530f1a9de0
Fixes: #4063
Diffstat (limited to 'lib/sqlalchemy/sql/default_comparator.py')
| -rw-r--r-- | lib/sqlalchemy/sql/default_comparator.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/default_comparator.py b/lib/sqlalchemy/sql/default_comparator.py index 4485c661b..a52bdbaed 100644 --- a/lib/sqlalchemy/sql/default_comparator.py +++ b/lib/sqlalchemy/sql/default_comparator.py @@ -81,6 +81,18 @@ def _boolean_compare(expr, op, obj, negate=None, reverse=False, negate=negate, modifiers=kwargs) +def _custom_op_operate(expr, op, obj, reverse=False, result_type=None, + **kw): + if result_type is None: + if op.return_type: + result_type = op.return_type + elif op.is_comparison: + result_type = type_api.BOOLEANTYPE + + return _binary_operate( + expr, op, obj, reverse=reverse, result_type=result_type, **kw) + + def _binary_operate(expr, op, obj, reverse=False, result_type=None, **kw): obj = _check_literal(expr, op, obj) @@ -249,7 +261,7 @@ operator_lookup = { "div": (_binary_operate,), "mod": (_binary_operate,), "truediv": (_binary_operate,), - "custom_op": (_binary_operate,), + "custom_op": (_custom_op_operate,), "json_path_getitem_op": (_binary_operate, ), "json_getitem_op": (_binary_operate, ), "concat_op": (_binary_operate,), |