[FIX] pg: match manual m2m table names

The regex for matching m2m table names was not strict
in the start and end of the name, it could still match
tables with suffix _1 for example.
The other issue with the regex is not considering manual
names that start with 'x_', the 'x_' prefix was taken
as part of the name of the other table instead of keeping
it in the beginning of the name.
This fix adds a matching group for the 'x_' prefix and
ensures the start and end of the regex are strict.
It also renames the manual m2m relation in ir_model_fields
table, matching the rename done for column names.

closes #335

Signed-off-by: Christophe Simonis (chs) <chs@odoo.com>

Author: jjmaksoud

src/base/tests/test_util.py

@@ -1057,6 +1057,46 @@ def test_create_m2m(self):
         self.assertEqual("res_groups_res_users_rel", auto_generated_m2m_table_name)
         self.assertTrue(util.table_exists(cr, auto_generated_m2m_table_name))
 
+    def test_rename_m2m(self):
+        cr = self.env.cr
+
+        self.env["ir.model"].create({"model": "x_new.model", "name": "Custom test model"})
+        manual_model_id = self.env["ir.model"].create({"model": "x_manual.model", "name": "Manual model"}).id
+
+        field_regular = self.env["ir.model.fields"].create(
+            {
+                "name": "x_m2m_field_regular",
+                "ttype": "many2many",
+                "model_id": manual_model_id,
+                "relation": "x_new.model",
+                "relation_table": "x_x_manual_model_x_new_model_rel",
+            }
+        )
+        field_custom = self.env["ir.model.fields"].create(
+            {
+                "name": "x_m2m_field_custom",
+                "ttype": "many2many",
+                "model_id": manual_model_id,
+                "relation": "x_new.model",
+                "relation_table": "x_x_manual_model_x_new_model_rel_2",
+            }
+        )
+        old_regular_table = field_regular.relation_table
+        old_custom_table = field_custom.relation_table
+
+        util.pg_rename_table(cr, "x_new_model", "new_special_model")
+        util.update_m2m_tables(cr, "x_new_model", "new_special_model")
+        util.invalidate(field_regular)
+
+        new_regular_table = field_regular.relation_table
+        self.assertEqual(new_regular_table, "x_new_special_model_x_manual_model_rel")
+        self.assertEqual(field_custom.relation_table, old_custom_table)
+        self.assertEqual(field_regular.column2, "new_special_model_id")
+        self.assertEqual(field_custom.column2, "new_special_model_id")
+        self.assertTrue(util.table_exists(cr, new_regular_table))
+        self.assertTrue(util.table_exists(cr, old_custom_table))
+        self.assertFalse(util.table_exists(cr, old_regular_table))
+
 
 class TestORM(UnitTestCase):
     def test_create_cron(self):

src/util/pg.py

@@ -1411,13 +1411,22 @@ def update_m2m_tables(cr, old_table, new_table, ignored_m2ms=()):
     for orig_m2m_table in get_m2m_tables(cr, new_table):
         if orig_m2m_table in ignored_m2ms:
             continue
-        m = re.match(r"^(\w+)_{0}_rel|{0}_(\w+)_rel$".format(re.escape(old_table)), orig_m2m_table)
+        m = re.match(r"^(x_|)(?:(\w+)_{0}|{0}_(\w+))_rel$".format(re.escape(old_table)), orig_m2m_table)
         if m:
-            m2m_table = "{}_{}_rel".format(*sorted([m.group(1) or m.group(2), new_table]))
+            m2m_table = "{}{}_{}_rel".format(m.group(1), *sorted([m.group(2) or m.group(3), new_table]))
             # Due to the 63 chars limit in generated constraint names, for long table names the FK
             # constraint is dropped when renaming the table. We need the constraint to correctly
             # identify the FK targets. The FK constraints will be dropped and recreated below.
             rename_table(cr, orig_m2m_table, m2m_table, remove_constraints=False)
+            cr.execute(
+                """
+                UPDATE ir_model_fields
+                   SET relation_table = %s
+                 WHERE relation_table = %s
+                   AND state = 'manual'
+                """,
+                [m2m_table, orig_m2m_table],
+            )
             _logger.info("Renamed m2m table %s to %s", orig_m2m_table, m2m_table)
         else:
             m2m_table = orig_m2m_table