From ad82849bbe4ef329129204d02781f737c0c79fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilja=20Everil=C3=A4?= <saarni@gmail.com>
Date: Wed, 10 Sep 2014 11:34:33 +0300
Subject: implementation for <aggregate_fun> FILTER (WHERE ...)

---
 lib/sqlalchemy/sql/functions.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/sql/functions.py')

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 7efb1e916..46f3e27dc 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -12,7 +12,7 @@ from . import sqltypes, schema
 from .base import Executable, ColumnCollection
 from .elements import ClauseList, Cast, Extract, _literal_as_binds, \
     literal_column, _type_from_args, ColumnElement, _clone,\
-    Over, BindParameter
+    Over, BindParameter, AggregateFilter
 from .selectable import FromClause, Select, Alias
 
 from . import operators
@@ -116,6 +116,28 @@ class FunctionElement(Executable, ColumnElement, FromClause):
         """
         return Over(self, partition_by=partition_by, order_by=order_by)
 
+    def filter(self, *criterion):
+        """Produce a FILTER clause against this function.
+
+        Used against aggregate functions,
+        for database backends that support aggregate "FILTER" clause.
+
+        The expression::
+
+            func.count(1).filter(True)
+
+        is shorthand for::
+
+            from sqlalchemy import aggregatefilter
+            aggregatefilter(func.count(1), True)
+
+        See :func:`~.expression.aggregatefilter` for a full description.
+
+        """
+        if not criterion:
+            return self
+        return AggregateFilter(self, *criterion)
+
     @property
     def _from_objects(self):
         return self.clauses._from_objects
-- 
cgit v1.2.1


From ab1c25266dd49f087b5fff316b6ba6fb610b1d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilja=20Everil=C3=A4?= <saarni@gmail.com>
Date: Thu, 11 Sep 2014 15:29:33 +0300
Subject: renamed aggregatefilter to funcfilter, since it is that

---
 lib/sqlalchemy/sql/functions.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/sqlalchemy/sql/functions.py')

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 46f3e27dc..a07eca8c6 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -12,7 +12,7 @@ from . import sqltypes, schema
 from .base import Executable, ColumnCollection
 from .elements import ClauseList, Cast, Extract, _literal_as_binds, \
     literal_column, _type_from_args, ColumnElement, _clone,\
-    Over, BindParameter, AggregateFilter
+    Over, BindParameter, FunctionFilter
 from .selectable import FromClause, Select, Alias
 
 from . import operators
@@ -119,8 +119,8 @@ class FunctionElement(Executable, ColumnElement, FromClause):
     def filter(self, *criterion):
         """Produce a FILTER clause against this function.
 
-        Used against aggregate functions,
-        for database backends that support aggregate "FILTER" clause.
+        Used against aggregate and window functions,
+        for database backends that support the "FILTER" clause.
 
         The expression::
 
@@ -128,15 +128,15 @@ class FunctionElement(Executable, ColumnElement, FromClause):
 
         is shorthand for::
 
-            from sqlalchemy import aggregatefilter
-            aggregatefilter(func.count(1), True)
+            from sqlalchemy import funcfilter
+            funcfilter(func.count(1), True)
 
-        See :func:`~.expression.aggregatefilter` for a full description.
+        See :func:`~.expression.funcfilter` for a full description.
 
         """
         if not criterion:
             return self
-        return AggregateFilter(self, *criterion)
+        return FunctionFilter(self, *criterion)
 
     @property
     def _from_objects(self):
-- 
cgit v1.2.1


From 49e750a1d788710b89764c4dd9c0ddbf9b1f38ad Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 4 Oct 2014 12:18:20 -0400
Subject: - changelog, migration for pr github:134

---
 lib/sqlalchemy/sql/functions.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/sql/functions.py')

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index a07eca8c6..9280c7d60 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -131,7 +131,14 @@ class FunctionElement(Executable, ColumnElement, FromClause):
             from sqlalchemy import funcfilter
             funcfilter(func.count(1), True)
 
-        See :func:`~.expression.funcfilter` for a full description.
+        .. versionadded:: 1.0.0
+
+        .. seealso::
+
+            :class:`.FunctionFilter`
+
+            :func:`.funcfilter`
+
 
         """
         if not criterion:
-- 
cgit v1.2.1