diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-13 15:26:53 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-13 15:26:53 -0400 |
| commit | 0a8f2207f0874c9639a2968e18bce88e6cb55c69 (patch) | |
| tree | de1eff7604d36c120c49231a8c6da003287884c1 /lib/sqlalchemy/sql/expression.py | |
| parent | 20f5a481686c273924c06537d661aa69a6a566cc (diff) | |
| download | sqlalchemy-0a8f2207f0874c9639a2968e18bce88e6cb55c69.tar.gz | |
- func.XXX() doesn't inadvertently resolve to non-Function
classes (e.g. fixes func.text()). [ticket:1798]
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 9ac5c1d66..5084495c3 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -855,7 +855,9 @@ class _FunctionGenerator(object): if functions is None: from sqlalchemy.sql import functions func = getattr(functions, self.__names[-1].lower(), None) - if func is not None: + if func is not None and \ + isinstance(func, type) and \ + issubclass(func, Function): return func(*c, **o) return Function( |