From 0a8f2207f0874c9639a2968e18bce88e6cb55c69 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 13 May 2010 15:26:53 -0400 Subject: - func.XXX() doesn't inadvertently resolve to non-Function classes (e.g. fixes func.text()). [ticket:1798] --- lib/sqlalchemy/sql/expression.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql') 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( -- cgit v1.2.1