diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-04-01 13:03:52 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-04-01 13:03:52 -0400 |
| commit | 2e5c8913a8e15e649322c0907199361df9698153 (patch) | |
| tree | 1c87108bf0e47734d14e7bf4f868f0d8e626ffd9 /lib/sqlalchemy/sql/selectable.py | |
| parent | e16ede8cae00fd5cbbd5fb33d63c14df0153c2bc (diff) | |
| download | sqlalchemy-2e5c8913a8e15e649322c0907199361df9698153.tar.gz | |
- Fixes to the newly enhanced boolean coercion in :ticket:`2804` where
the new rules for "where" and "having" woudn't take effect for the
"whereclause" and "having" kw arguments of the :func:`.select` construct,
which is also what :class:`.Query` uses so wasn't working in the
ORM either. fixes #3013 re: #2804
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index f64a70ec8..2ce164445 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -2191,12 +2191,12 @@ class Select(HasPrefixes, GenerativeSelect): self._raw_columns = [] if whereclause is not None: - self._whereclause = _literal_as_text(whereclause) + self._whereclause = and_(True_._singleton(), whereclause) else: self._whereclause = None if having is not None: - self._having = _literal_as_text(having) + self._having = and_(True_._singleton(), having) else: self._having = None |