openstack
/
monasca-api
Code Issues Proposed changes

Merge "Add python3 support for models_reposiotry tests"

This commit is contained in:
Zuul 2018-01-24 12:42:15 +00:00 committed by Gerrit Code Review
parent e48ea3ef4c 352ea0d241
commit 853af4caf2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monasca_api/common/repositories/sqla/models.py
View File

@ -229,12 +229,13 @@ def _field_sort_mysql(element, compiler_, **kw):
@compiler.compiles(field_sort)
def _field_sort_general(element, compiler_, **kw):
fields_list = []
if element.fields:
fields = list(element.fields)
if fields:
fields_list.append("CASE")
for idx, field in enumerate(element.fields):
for idx, field in enumerate(fields):
fields_list.append("WHEN {0}={1} THEN {2}".format(compiler_.process(element.column),
compiler_.process(field),
idx))
fields_list.append("ELSE {0}".format(len(element.fields)))
fields_list.append("ELSE {0}".format(len(fields)))
fields_list.append("END")
return " ".join(fields_list)