Skip to content

[FIX] util/orm: don't mark inherited field manual for custom #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sagu-odoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] util/orm: don't mark inherited field manual for custom #418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 40 additions & 22 deletions src/util/orm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from itertools import chain
from textwrap import dedent

from psycopg2 import sql

try:
from unittest.mock import patch
except ImportError:
Expand Down Expand Up @@ -663,34 +665,50 @@ def custom_module_field_as_manual(env, rollback=True, do_flush=False):
# if the field was not correctly removed from the database during past upgrades, the field remains in the database.
reserved_words = ["env"]
ignores = {"ir.actions.server": ["condition"], "ir.ui.view": ["page"]}

cte = ""
include = ""
if version_gte("17.0"):
cte = """
WITH delegated_fields AS (
SELECT array_agg(f.id) AS ids
FROM ir_model_fields f
JOIN ir_model m
ON m.id = f.model_id
AND m.model = %(model)s
JOIN ir_model_inherit i
ON i.model_id = m.id
AND i.parent_field_id IS NOT NULL
JOIN ir_model_fields lf
ON lf.id = i.parent_field_id
WHERE f.related = lf.name || '.' || f.name
)
"""
include = "AND id NOT IN (SELECT unnest(ids) FROM delegated_fields)"

query = format_query(
env.cr,
"""
{cte}
UPDATE ir_model_fields
SET state = 'manual'
WHERE state = 'base'
AND model = %(model)s
AND name NOT IN %(fields)s
{include}
RETURNING id
""",
cte=sql.SQL(cte),
include=sql.SQL(include),
)
for model in models:
model_fields = tuple(list(env.registry[model]._fields) + reserved_words + ignores.get(model, []))
env.cr.execute(
"""
UPDATE ir_model_fields
SET state = 'manual'
WHERE state = 'base'
AND model = %s
AND name not in %s
RETURNING id
""",
[model, model_fields],
)
env.cr.execute(query, {"model": model, "fields": model_fields})
updated_field_ids += [r[0] for r in env.cr.fetchall()]

# 2.2 Convert fields of custom models, models that were just converted to `manual` models in the previous step.
for model in custom_models:
env.cr.execute(
"""
UPDATE ir_model_fields
SET state = 'manual'
WHERE state = 'base'
AND model = %s
AND name not in %s
RETURNING id
""",
(model, tuple(reserved_words)),
)
env.cr.execute(query, {"model": model, "fields": model_fields})
updated_field_ids += [r[0] for r in env.cr.fetchall()]

# 2.3 Temporarily disable rules that come from custom modules
Expand Down