openstack/deb-gnocchi
Code Issues Proposed changes

Merge "sqlalchemy: use a list rather than if/elif to convert type in queries"

Browse Source
This commit is contained in:
Jenkins 2017-01-24 17:33:53 +00:00 committed by Gerrit Code Review
commit 6f66b3fb87
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnocchi/indexer/sqlalchemy.py
View File

@ -1128,6 +1128,14 @@ class QueryTransformer(object):
u"∧": sqlalchemy.and_,
}
converters = (
(base.TimestampUTC, utils.to_datetime),
(sqlalchemy_utils.UUIDType, utils.ResourceUUID),
(types.String, six.text_type),
(types.Integer, int),
(types.Numeric, float),
)
@classmethod
def _handle_multiple_op(cls, engine, table, op, nodes):
return op(*[
@ -1184,28 +1192,17 @@ class QueryTransformer(object):
# Convert value to the right type
if value is not None:
converter = None
if isinstance(attr.type, base.TimestampUTC):
converter = utils.to_datetime
elif isinstance(attr.type, sqlalchemy_utils.UUIDType):
converter = utils.ResourceUUID
elif isinstance(attr.type, types.String):
converter = six.text_type
elif isinstance(attr.type, types.Integer):
converter = int
elif isinstance(attr.type, types.Numeric):
converter = float
if converter:
try:
if isinstance(value, list):
# we got a list for in_ operator
value = [converter(v) for v in value]
else:
value = converter(value)
except Exception:
raise indexer.QueryValueError(value, field_name)
for klass, converter in cls.converters:
if isinstance(attr.type, klass):
try:
if isinstance(value, list):
# we got a list for in_ operator
value = [converter(v) for v in value]
else:
value = converter(value)
except Exception:
raise indexer.QueryValueError(value, field_name)
break
return op(attr, value)