refactors in join to register complex aliases on duplicate, to do is doing the same in filter clauses

ormar/models/helpers/models.py

@@ -22,12 +22,12 @@ def is_field_an_forward_ref(field: Type["BaseField"]) -> bool:
     :rtype: bool
     """
     return issubclass(field, ForeignKeyField) and (
-        field.to.__class__ == ForwardRef or field.through.__class__ == ForwardRef
+            field.to.__class__ == ForwardRef or field.through.__class__ == ForwardRef
     )
 
 
 def populate_default_options_values(
-    new_model: Type["Model"], model_fields: Dict
+        new_model: Type["Model"], model_fields: Dict
 ) -> None:
     """
     Sets all optional Meta values to it's defaults
@@ -52,7 +52,8 @@ def populate_default_options_values(
         new_model.Meta.abstract = False
 
     if any(
-        is_field_an_forward_ref(field) for field in new_model.Meta.model_fields.values()
+            is_field_an_forward_ref(field) for field in
+            new_model.Meta.model_fields.values()
     ):
         new_model.Meta.requires_ref_update = True
     else:
@@ -77,7 +78,7 @@ def extract_annotations_and_default_vals(attrs: Dict) -> Tuple[Dict, Dict]:
 
 # cannot be in relations helpers due to cyclical import
 def validate_related_names_in_relations(  # noqa CCR001
-    model_fields: Dict, new_model: Type["Model"]
+        model_fields: Dict, new_model: Type["Model"]
 ) -> None:
     """
     Performs a validation of relation_names in relation fields.
@@ -122,20 +123,24 @@ def group_related_list(list_: List) -> Dict:
     will become:
     {'people': {'houses': [], 'cars': ['models', 'colors']}}
 
+    Result dictionary is sorted by length of the values and by key
+
     :param list_: list of related models used in select related
     :type list_: List[str]
     :return: list converted to dictionary to avoid repetition and group nested models
     :rtype: Dict[str, List]
     """
-    test_dict: Dict[str, Any] = dict()
+    result_dict: Dict[str, Any] = dict()
+    list_.sort(key=lambda x: x.split("__")[0])
     grouped = itertools.groupby(list_, key=lambda x: x.split("__")[0])
     for key, group in grouped:
         group_list = list(group)
-        new = [
+        new = sorted([
             "__".join(x.split("__")[1:]) for x in group_list if len(x.split("__")) > 1
-        ]
+        ])
         if any("__" in x for x in new):
-            test_dict[key] = group_related_list(new)
+            result_dict[key] = group_related_list(new)
         else:
-            test_dict[key] = new
-    return test_dict
+            result_dict.setdefault(key, []).extend(new)
+    return {k: v for k, v in
+            sorted(result_dict.items(), key=lambda item: len(item[1]))}