diff options
| author | Gaëtan de Menten <gdementen@gmail.com> | 2007-07-31 14:54:28 +0000 |
|---|---|---|
| committer | Gaëtan de Menten <gdementen@gmail.com> | 2007-07-31 14:54:28 +0000 |
| commit | 9c31abf1d3bc06b6e7eba8d4bbee7569636c4a33 (patch) | |
| tree | d83497ae5277e18079ca94a71c1ead2fee673698 /lib/sqlalchemy/sql.py | |
| parent | 04e8a839b4bc6a612b88ff793755865591b48ac4 (diff) | |
| download | sqlalchemy-9c31abf1d3bc06b6e7eba8d4bbee7569636c4a33.tar.gz | |
- restored old assign_mapper monkey patched query methods but with two differences:
* added a deprecation warning
* check if a method with that name already exist in the class
- more foolproof deprecation warning for scalar kwarg
Diffstat (limited to 'lib/sqlalchemy/sql.py')
| -rw-r--r-- | lib/sqlalchemy/sql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index b27e82370..479f13a8a 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -214,9 +214,9 @@ def select(columns=None, whereclause=None, from_obj=[], **kwargs): rendered in the ``FROM`` clause of this select statement. """ - scalar = kwargs.pop('scalar', False) - if scalar: + if 'scalar' in kwargs: util.warn_deprecated('scalar option is deprecated; see docs for details') + scalar = kwargs.pop('scalar', False) s = Select(columns, whereclause=whereclause, from_obj=from_obj, **kwargs) if scalar: return s.as_scalar() |