From b7ba3f0d9395236cbf05f830d82f6494163d1dfb Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 25 Sep 2018 11:11:41 -0400 Subject: Accept multiple expressions for aggregate_order_by order_by Added support for the :class:`.aggregate_order_by` function to receive multiple ORDER BY elements, previously only a single element was accepted. Fixes: #4337 Change-Id: I411ac31697a0d65b568ad65ce5b5181717afbd65 --- lib/sqlalchemy/dialects/postgresql/ext.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/dialects/postgresql/ext.py') diff --git a/lib/sqlalchemy/dialects/postgresql/ext.py b/lib/sqlalchemy/dialects/postgresql/ext.py index 71fb3cc5b..a588eafdd 100644 --- a/lib/sqlalchemy/dialects/postgresql/ext.py +++ b/lib/sqlalchemy/dialects/postgresql/ext.py @@ -39,6 +39,8 @@ class aggregate_order_by(expression.ColumnElement): .. versionadded:: 1.1 + .. versionchanged:: 1.2.13 - the ORDER BY argument may be multiple terms + .. seealso:: :class:`.array_agg` @@ -47,9 +49,18 @@ class aggregate_order_by(expression.ColumnElement): __visit_name__ = 'aggregate_order_by' - def __init__(self, target, order_by): + def __init__(self, target, *order_by): self.target = elements._literal_as_binds(target) - self.order_by = elements._literal_as_binds(order_by) + + _lob = len(order_by) + if _lob == 0: + raise TypeError("at least one ORDER BY element is required") + elif _lob == 1: + self.order_by = elements._literal_as_binds(order_by[0]) + else: + self.order_by = elements.ClauseList( + *order_by, + _literal_as_text=elements._literal_as_binds) def self_group(self, against=None): return self -- cgit v1.2.1