[IMP] util._normalize_pg_type

Handle type suffixes.

closes #345

Related: odoo/upgrade#8715
Signed-off-by: Christophe Simonis (chs) <[email protected]>

Author: KangOl

src/base/tests/test_util.py

@@ -718,6 +718,36 @@ def test_iter_browse_call_twice(self):
 
 
 class TestPG(UnitTestCase):
+    @parametrize(
+        [
+            # explicit conversions
+            ("boolean", "bool"),
+            ("smallint", "int2"),
+            ("integer", "int4"),
+            ("bigint", "int8"),
+            ("real", "float4"),
+            ("double precision", "float8"),
+            ("character varying", "varchar"),
+            ("timestamp with time zone", "timestamptz"),
+            ("timestamp without time zone", "timestamp"),
+            # noop for existing types
+            ("bool", "bool"),
+            ("int4", "int4"),
+            ("varchar", "varchar"),
+            # and unspecified/unknown types
+            ("jsonb", "jsonb"),
+            ("foo", "foo"),
+            # keep suffix (for arrays and sized limited varchar)
+            ("int4[]", "int4[]"),
+            ("varchar(2)", "varchar(2)"),
+            # but also convert types
+            ("integer[]", "int4[]"),
+            ("character varying(16)", "varchar(16)"),
+        ]
+    )
+    def test__normalize_pg_type(self, type_, expected):
+        self.assertEqual(util.pg._normalize_pg_type(type_), expected)
+
     @parametrize(
         [
             ("res_country", "name", False, "jsonb" if util.version_gte("16.0") else "varchar"),  # translated field

src/util/pg.py

@@ -616,6 +616,7 @@ def column_updatable(cr, table, column):
 
 
 def _normalize_pg_type(type_):
+    main_type, suffix = re.match(r"(.+?)((?:\[\]|\([0-9]+\))*)$", type_).groups()
     aliases = {
         "boolean": "bool",
         "smallint": "int2",
@@ -627,7 +628,7 @@ def _normalize_pg_type(type_):
         "timestamp with time zone": "timestamptz",
         "timestamp without time zone": "timestamp",
     }
-    return aliases.get(type_.lower(), type_)
+    return aliases.get(main_type.strip().lower(), main_type) + suffix
 
 
 def create_column(cr, table, column, definition, **kwargs):