[FIX] util.indirect_references: use table_name instead of model_name

[Pirols]

Otherwise errors (such as the following) will ensue.

2024-09-24 12:11:34,164 2158 ERROR matt-purchase odoo.upgrade.base.tests.test_util: ERROR: TestRecords.test_rename_xmlid
Traceback (most recent call last):
  File "/upgrade-util/src/base/tests/test_util.py", line 1030, in test_rename_xmlid
    res = util.rename_xmlid(cr, "base.TX1", "base.TX2", on_collision="merge")
  File "/upgrade-util/src/util/records.py", line 751, in rename_xmlid
    replace_record_references(cr, (model, old_id), (model, new_id), replace_xmlid=False)
  File "/upgrade-util/src/util/records.py", line 1308, in replace_record_references
    return replace_record_references_batch(cr, {old[1]: new[1]}, old[0], new[0], replace_xmlid)
  File "/upgrade-util/src/util/records.py", line 1490, in replace_record_references_batch
    explode_execute(cr, query, table=ir.table)
  File "/upgrade-util/src/util/pg.py", line 352, in explode_execute
    explode_query_range(cr, query, table, alias=alias, bucket_size=bucket_size),
  File "/upgrade-util/src/util/pg.py", line 259, in explode_query_range
    cr.execute(format_query(cr, "SELECT min(id), max(id) FROM {}", table))
  File "/tmp/tmpinhjowz1/odoo/pr/153463/odoo/sql_db.py", line 354, in execute
    res = self._obj.execute(query, params)
psycopg2.errors.UndefinedTable: relation "res.partner" does not exist
LINE 1: SELECT min(id), max(id) FROM "res.partner"

[robodoo]

[KangOl]

upgradeci retry with always only purchase

[aj-fuentes]

LGTM

[KangOl]

There are still some weird errors: https://upgradeci.odoo.com/upgradeci/run/165581

[Pirols]

There are still some weird errors: https://upgradeci.odoo.com/upgradeci/run/165581

Yes, I'm debugging those.

[aj-fuentes]

From DM discussion, these lines

upgrade-util/src/util/records.py

Lines 1472 to 1489 in a402a8d

	query = cr.mogrify(
	format_query(
	cr,
	"""
	UPDATE {table}
	SET {column} = (
	SELECT jsonb_object_agg(key, COALESCE((%s::jsonb->>value)::int, value::int))
	FROM jsonb_each_text({column})
	)
	WHERE {column} IS NOT NULL
	AND {column} @? %s
	AND {{parallel_filter}}
	""",
	table=ir.table,
	column=ir.res_id,
	),
	[Json(id_mapping), "$.* ? ({})".format(" || ".join(map("@ == {}".format, id_mapping)))],
	).decode()

Should be something like:

                query = cr.mogrify(
                    format_query(
                        cr,
                        """
                        UPDATE {table}
                           SET {column} = (
                                   SELECT jsonb_object_agg(key, COALESCE(
                                                                   jsonb_object(%s::text[], %s::text[])->>value)::int,
                                                                   value::int
                                                                 ))
                                   FROM jsonb_each_text({column})
                               )
                         WHERE {column} IS NOT NULL
                           AND {column} @? %s
                           AND {{parallel_filter}}
                        """,
                        table=ir.table,
                        column=ir.res_id,
                    ),
                    [
                        list(id_mapping.keys()),
                        list(id_mapping.values(), 
                        "$.* ? ({})".format(" || ".join(map("@ == {}".format, id_mapping))),
                    ],
                ).decode()

The key idea: pass the keys and values from id_mapping, to be used as jsonb in the query. Avoiding in the process explicit jsonb dicts in the form {"key1": value1, ...} which causes issues for the query formatter.

[aj-fuentes]

Suggested change

	SELECT jsonb_object(ARRAY_AGG(key), %s)
	SELECT jsonb_object_agg(key, (jsonb_object(%s::text[], %s::text[])->>value)::int, value::int)

[KangOl]

Yes, this version avoids having literal { in the query.

Let's try it over my patch.

[aj-fuentes]

Suggested change

	[list(map(str, id_mapping.values())), "$.* ? ({})".format(" || ".join(map("@ == {}".format, id_mapping)))],
	[list(id_mapping.keys()), list(id_mapping.values()), "$.* ? ({})".format(" || ".join(map("@ == {}".format, id_mapping)))],

[KangOl]

@robodoo rebase-ff r+

[robodoo]

Merge method set to rebase and fast-forward.