- trailing underscores are trimmed from func.<xxx> calls, such as func.if_()

diff --git a/CHANGES b/CHANGES
index 1f8c26d7bf95e62d2d3a763d5cb6140bd0199d08..6d6aaf794af10c08188ca49022def05311905e3b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@
   - added "fetchmany()" support to ResultProxy
   - changed "BooleanExpression" to subclass from "BinaryExpression", so that boolean
   expressions can also follow column-clause behaviors (i.e. label(), etc).
+  - trailing underscores are trimmed from func.<xxx> calls, such as func.if_()
   - fix to correlation of subqueries when the column list of the select statement
   is constructed with individual calls to append_column(); this fixes an ORM
   bug whereby nested select statements were not getting correlated with the 

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index e0bae905a0f7ac822d10b127b61d15ae7079fa17..f944b468d6ed92dccecaa38c4c33c2335dc4d9e4 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -274,6 +274,8 @@ class _FunctionGateway(object):
     """returns a callable based on an attribute name, which then returns a _Function 
     object with that name."""
     def __getattr__(self, name):
+        if name[-1] == '_':
+            name = name[0:-1]
         return getattr(_FunctionGenerator(), name)
 func = _FunctionGateway()