fix minor code smells

ormar/models/modelproxy.py

@@ -71,8 +71,7 @@ class ModelTableProxy:
                     field.through, parent_model
                 )
                 return field.through, sub_field.get_alias()
-            else:
+            return target_model, field.get_alias()
-                return target_model, field.get_alias()
         target_field = target_model.get_column_alias(target_model.Meta.pkname)
         return target_model, target_field
 
@@ -88,9 +87,8 @@ 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)
-            column = target_model.resolve_relation_field(parent_model, target_model)
+        return column.get_alias() if use_raw else column.name
-            return column.get_alias() if use_raw else column.name
 
     @classmethod
     def get_filtered_names_to_extract(cls, prefetch_dict: Dict) -> List:

ormar/queryset/prefetch_query.py

@@ -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":
+        key, value = criteria
-            models.sort(key=lambda x: getattr(x, criteria[0]), reverse=True)
+        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
 
 

ormar/queryset/queryset.py

@@ -51,8 +51,7 @@ class QuerySet:
     ) -> "QuerySet":
         if issubclass(owner, ormar.Model):
             return self.__class__(model_cls=owner)
-        else:  # pragma nocover
+        return self.__class__()  # pragma: no cover
-            return self.__class__()
 
     @property
     def model_meta(self) -> "ModelMeta":