fix minor code smells
This commit is contained in:
@ -71,7 +71,6 @@ class ModelTableProxy:
|
||||
field.through, parent_model
|
||||
)
|
||||
return field.through, sub_field.get_alias()
|
||||
else:
|
||||
return target_model, field.get_alias()
|
||||
target_field = target_model.get_column_alias(target_model.Meta.pkname)
|
||||
return target_model, target_field
|
||||
@ -88,7 +87,6 @@ class ModelTableProxy:
|
||||
return (
|
||||
parent_model.get_column_alias(column_name) if use_raw else column_name
|
||||
)
|
||||
else:
|
||||
column = target_model.resolve_relation_field(parent_model, target_model)
|
||||
return column.get_alias() if use_raw else column.name
|
||||
|
||||
|
||||
@ -38,10 +38,11 @@ def sort_models(models: List["Model"], orders_by: Dict) -> List["Model"]:
|
||||
]
|
||||
sort_criteria = sort_criteria[::-1]
|
||||
for criteria in sort_criteria:
|
||||
if criteria[1] == "desc":
|
||||
models.sort(key=lambda x: getattr(x, criteria[0]), reverse=True)
|
||||
key, value = criteria
|
||||
if value == "desc":
|
||||
models.sort(key=lambda x: getattr(x, key), reverse=True)
|
||||
else:
|
||||
models.sort(key=lambda x: getattr(x, criteria[0]))
|
||||
models.sort(key=lambda x: getattr(x, key))
|
||||
return models
|
||||
|
||||
|
||||
|
||||
@ -51,8 +51,7 @@ class QuerySet:
|
||||
) -> "QuerySet":
|
||||
if issubclass(owner, ormar.Model):
|
||||
return self.__class__(model_cls=owner)
|
||||
else: # pragma nocover
|
||||
return self.__class__()
|
||||
return self.__class__() # pragma: no cover
|
||||
|
||||
@property
|
||||
def model_meta(self) -> "ModelMeta":
|
||||
|
||||
Reference in New Issue
Block a user