From 1a995ed8d45d872efbfa324f0bd68eb0d64ee6b4 Mon Sep 17 00:00:00 2001 From: Pierre Rust Date: Sat, 14 Jun 2014 17:11:57 +0200 Subject: [PATCH] Fix sorting without using the MultipleSort object. SQL syntax error when using a simple FlexFieldSort. --- beets/dbcore/query.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py index 14cb2af82..e240d3252 100644 --- a/beets/dbcore/query.py +++ b/beets/dbcore/query.py @@ -569,7 +569,7 @@ class MultipleSort(Sort): select_strings.append(select) select_string = ",".join(select_strings) - return "" if not select_string else ", " + select_string + return select_string def union_clause(self): sql_sorts = self._sql_sorts() @@ -730,7 +730,9 @@ def build_sql(model_cls, query, sort): if sort else "" slow_sort = False elif isinstance(sort, Sort): - sort_select = sort.select_clause() + select_clause = sort.select_clause() + sort_select = " ,{0} ".format(select_clause) \ + if select_clause else "" sort_union = sort.union_clause() slow_sort = sort.is_slow() order_clause = sort.order_clause()