[IMP] upgrade_analysis: better matches

Author: MiquelRForgeFlow

upgrade_analysis/compare.py

@@ -210,9 +210,6 @@ def clean_records(records):
     new_models = {column["model"] for column in new_records}
     old_models = {column["model"] for column in old_records}
 
-    matched_direct = 0
-    matched_other_module = 0
-    matched_other_type = 0
     in_obsolete_models = 0
 
     obsolete_models = []
@@ -244,7 +241,7 @@ def match(match_fields, report_fields, warn=False):
         return count
 
     matched_direct = match(
-        ["module", "mode", "model", "field"],
+        ["module", "model", "field", "type"],
         [
             "relation",
             "type",
@@ -259,7 +256,7 @@ def match(match_fields, report_fields, warn=False):
         ],
     )
 
-    # other module, same type and operation
+    # other module, same type
     matched_other_module = match(
         ["mode", "model", "field", "type"],
         [
@@ -275,11 +272,44 @@ def match(match_fields, report_fields, warn=False):
             "_order",
         ],
     )
+    matched_other_module += match(
+        ["model", "field", "type"],
+        [
+            "module",
+            "relation",
+            "selection_keys",
+            "_inherits",
+            "stored",
+            "isfunction",
+            "isrelated",
+            "required",
+            "table",
+            "_order",
+        ],
+    )
 
-    # other module, same operation, other type
+    # same module, other type
     matched_other_type = match(
-        ["module", "mode", "model", "field"],
+        ["module", "model", "field"],
+        [
+            "relation",
+            "type",
+            "selection_keys",
+            "_inherits",
+            "stored",
+            "isfunction",
+            "isrelated",
+            "required",
+            "table",
+            "_order",
+        ],
+    )
+
+    # other module, other type
+    matched_other_module_other_type = match(
+        ["mode", "model", "field"],
         [
+            "module",
             "relation",
             "type",
             "selection_keys",
@@ -352,6 +382,8 @@ def match(match_fields, report_fields, warn=False):
         "# Direct match: %d" % matched_direct,
         "# Found in other module: %d" % matched_other_module,
         "# Found with different type: %d" % matched_other_type,
+        "# Found in other module with different type: %d"
+        % matched_other_module_other_type,
         "# In obsolete models: %d" % in_obsolete_models,
         "# Not matched: %d" % len(old_records),
         "# New columns: %d" % len(new_records),