Query system doesn't respect order of ticket types

[Jun Omae]

The following query is generated from query:?owner=admin&order=type. The ticket types are defined in enum table and have the order.

However, the query doesn't sort by enum.value. If resolution, priority and severity, it sorts by enum.value.

SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS st
atus,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,t.reporter AS reporter,priority.value
 AS priority_value
FROM ticket AS t
  LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority)
WHERE ((COALESCE(t.reporter,'')=%s))
ORDER BY COALESCE(t.type,'')='',t.type,t.id

[Jun Omae]

Proposed changes in log:jomae.git@t12402.

[Jun Omae]

Committed in [14705] and merged to trunk in [14706].

[Ryan J Ollos]

This refactoring might simplify the expression a little bit:

trac/ticket/query.py

@@ -436 +436 @@
         enum_columns = [col for col in ('resolution', 'priority', 'severity',
                                         'type')
                             if col not in custom_fields and
-                               (col == 'priority' or col == self.order or
-                                col == self.group)]
+                               col in ('priority', self.order, self.group)]
         joined_columns = [col for col in ('milestone', 'version')
                               if col not in custom_fields and
-                                 (col == self.order or col == self.group)]
+                                 col in (self.order, self.group)]
         # 31 is max of joins in SQLite 32-bit
         use_joins = (len(set(cols) & custom_fields) +
                      len(enum_columns) + len(joined_columns)) <= 31

[Jun Omae]

Thanks. Applied in [14713-14714].