Merge lp:~dorian-kemps/unifield-server/US-10141 into lp:unifield-server

[jftempo]

=== modified file 'bin/service/security.py'
--- bin/service/security.py	2021-02-05 15:05:10 +0000
+++ bin/service/security.py	2022-06-28 10:18:28 +0000
@@ -27,6 +27,7 @@
 from passlib.hash import bcrypt
 from tools.translate import _
 from osv import osv
+from psycopg2._psycopg import ProgrammingError
 PASSWORD_MIN_LENGHT = 8
 
 # When rejecting a password, hide the traceback
@@ -49,10 +50,13 @@
         if pooler.pool_dic[cr.dbname]._ready:
             return False
         ready = False
-    cr.execute("select count(id) from ir_module_module where state in ('to install', 'to upgrade')")
-    n = cr.fetchone()
-    if n and n[0]:
-        return n[0]
+    try:
+        cr.execute("select count(id) from ir_module_module where state in ('to install', 'to upgrade')")
+        n = cr.fetchone()
+        if n and n[0]:
+            return n[0]
+    except ProgrammingError:
+        raise Exception("BadRestoration: The table ir_module_module is missing")
     if not ready:
         # when loading the trans. modules are installed but db is not ready
         return True
 
=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py	2020-03-10 13:14:15 +0000
+++ bin/service/web_services.py	2022-06-28 10:18:28 +0000
@@ -364,7 +364,7 @@
 
             self._create_empty_database(db_name)
 
-            cmd = ['pg_restore', '--no-owner', '--no-acl', '-n', 'public']
+            cmd = ['pg_restore', '--no-owner', '--no-acl', '-n', 'public', '--single-transaction']
             if tools.config['db_user']:
                 cmd.append('--username=' + tools.config['db_user'])
             if tools.config['db_host']: