diff options
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/models/ir_fields.py | 27 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_model.py | 4 |
2 files changed, 29 insertions, 2 deletions
diff --git a/odoo/addons/base/models/ir_fields.py b/odoo/addons/base/models/ir_fields.py index ad0b00fe2cf..ccf4574b2e4 100644 --- a/odoo/addons/base/models/ir_fields.py +++ b/odoo/addons/base/models/ir_fields.py @@ -344,7 +344,7 @@ class IrFieldsConverter(models.AbstractModel): else: xmlid = "%s.%s" % (self._context.get('_import_current_module', ''), value) flush(xml_id=xmlid) - id = self.env['ir.model.data'].xmlid_to_res_id(xmlid, raise_if_not_found=False) or None + id = self._xmlid_to_record_id(xmlid, RelatedModel) elif subfield is None: field_type = _(u"name") if value == '': @@ -383,6 +383,31 @@ class IrFieldsConverter(models.AbstractModel): {'moreinfo': action}) return id, field_type, warnings + def _xmlid_to_record_id(self, xmlid, model): + """ Return the record id corresponding to the given external id, + provided that the record actually exists; otherwise return ``None``. + """ + import_cache = self.env.context.get('import_cache', {}) + result = import_cache.get(xmlid) + + if not result: + module, name = xmlid.split('.', 1) + query = """ + SELECT d.model, d.res_id + FROM ir_model_data d + JOIN "{}" r ON d.res_id = r.id + WHERE d.module = %s AND d.name = %s + """.format(model._table) + self.env.cr.execute(query, [module, name]) + result = self.env.cr.fetchone() + + if result: + res_model, res_id = import_cache[xmlid] = result + if res_model != model._name: + MSG = "Invalid external ID %s: expected model %r, found %r" + raise ValueError(MSG % (xmlid, model._name, res_model)) + return res_id + def _referencing_subfield(self, record): """ Checks the record for the subfields allowing referencing (an existing record in an other table), errors out if it finds potential diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index 4f8a39f79b3..adbae99303a 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -2008,7 +2008,9 @@ class IrModelData(models.Model): INSERT INTO ir_model_data (module, name, model, res_id, noupdate) VALUES {rows} ON CONFLICT (module, name) - DO UPDATE SET write_date=(now() at time zone 'UTC') {where} + DO UPDATE SET (model, res_id, write_date) = + (EXCLUDED.model, EXCLUDED.res_id, now() at time zone 'UTC') + {where} """.format( rows=", ".join([rowf] * len(sub_rows)), where="WHERE NOT ir_model_data.noupdate" if update else "", |