summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-10-04 11:51:52 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-10-04 11:51:52 -0400
commitbe2541736d886eefa6bdbae5581536abba198736 (patch)
tree957aa28ecb3cd8956ddfa8dc8ab2b7195e666312 /lib/sqlalchemy/sql/expression.py
parent4da020dae324cb871074e302f4840e8731988be0 (diff)
parent76c06aa65345b47af38a0a1d20638dfbc890b640 (diff)
downloadsqlalchemy-be2541736d886eefa6bdbae5581536abba198736.tar.gz
Merge remote-tracking branch 'origin/pr/134' into pr134
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index d96f048b9..2e10b7370 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -36,7 +36,7 @@ from .elements import ClauseElement, ColumnElement,\
True_, False_, BinaryExpression, Tuple, TypeClause, Extract, \
Grouping, not_, \
collate, literal_column, between,\
- literal, outparam, type_coerce, ClauseList
+ literal, outparam, type_coerce, ClauseList, FunctionFilter
from .elements import SavepointClause, RollbackToSavepointClause, \
ReleaseSavepointClause
@@ -97,6 +97,8 @@ outerjoin = public_factory(Join._create_outerjoin, ".expression.outerjoin")
insert = public_factory(Insert, ".expression.insert")
update = public_factory(Update, ".expression.update")
delete = public_factory(Delete, ".expression.delete")
+funcfilter = public_factory(
+ FunctionFilter, ".expression.funcfilter")
# internal functions still being called from tests and the ORM,