[MERGE] forward port branch saas-12.3 up to 120359bf0c9

1 files changed, 5 insertions, 1 deletions

diff --git a/odoo/fields.py b/odoo/fields.py
index 8d977e6cde3..5d0cf903232 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -945,7 +945,11 @@ class Field(MetaField('DummyField', (object,), {})):
         """
         indexname = '%s_%s_index' % (model._table, self.name)
         if self.index:
-            sql.create_index(model._cr, indexname, model._table, ['"%s"' % self.name])
+            try:
+                with model._cr.savepoint():
+                    sql.create_index(model._cr, indexname, model._table, ['"%s"' % self.name])
+            except psycopg2.OperationalError:
+                _schema.error("Unable to add index for %s", self)
         else:
             sql.drop_index(model._cr, indexname, model._table)