summaryrefslogtreecommitdiff
path: root/odoo/service
diff options
context:
space:
mode:
authorNils Hamerlinck <nils@hamerlinck.fr>2020-02-28 11:19:41 +0000
committerMartin Trigaux <mat@odoo.com>2020-03-10 16:50:06 +0000
commitb381b0eb6fa2214754da2904aa9f5a8b39c02f4d (patch)
tree2167a4b28cf43583c02b45f5e0e275bd08d2a538 /odoo/service
parent38781f16494fa33b093d789d6706d02d3f5b40ac (diff)
[IMP] db: install unaccent extension on new databases
The unaccent extension was installed only at restore, not at creation of a database. Make both consistent. closes odoo/odoo#46534 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'odoo/service')
-rw-r--r--odoo/service/db.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/odoo/service/db.py b/odoo/service/db.py
index 58708ee2e2c..095b040f4d4 100644
--- a/odoo/service/db.py
+++ b/odoo/service/db.py
@@ -111,6 +111,15 @@ def _create_empty_database(name):
(name, collate, chosen_template)
)
+ if odoo.tools.config['unaccent']:
+ try:
+ db = odoo.sql_db.db_connect(name)
+ with closing(db.cursor()) as cr:
+ cr.execute("CREATE EXTENSION unaccent")
+ cr.commit()
+ except psycopg2.Error:
+ pass
+
@check_db_management_enabled
def exp_create_database(db_name, demo, lang, user_password='admin', login='admin', country_code=None, phone=None):
""" Similar to exp_create but blocking."""
@@ -302,13 +311,6 @@ def restore_db(db, dump_file, copy=False):
filestore_dest = env['ir.attachment']._filestore()
shutil.move(filestore_path, filestore_dest)
- if odoo.tools.config['unaccent']:
- try:
- with cr.savepoint(flush=False):
- cr.execute("CREATE EXTENSION unaccent")
- except psycopg2.Error:
- pass
-
_logger.info('RESTORE DB: %s', db)
@check_db_management_enabled