From a1e5c645d97e4e8f48cec546e858643029b7424a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 9 Feb 2012 22:33:17 +0100
Subject: [PATCH] postgres use postgres instead of template1 and template1
 instead of template0

bzr revid: al@openerp.com-20120209213317-3tt4o0sj87764ocn
---
 openerp/service/web_services.py | 10 +++++-----
 openerp/tools/config.py         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 3a9ba89c002..24ec650e432 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -117,7 +117,7 @@ class db(netsvc.ExportService):
         return fn(*params)
 
     def _create_empty_database(self, name):
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         chosen_template = tools.config['db_template']
         try:
@@ -176,7 +176,7 @@ class db(netsvc.ExportService):
         openerp.modules.registry.RegistryManager.delete(db_name)
         sql_db.close_db(db_name)
 
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         cr.autocommit(True) # avoid transaction block
         try:
@@ -278,7 +278,7 @@ class db(netsvc.ExportService):
         openerp.modules.registry.RegistryManager.delete(old_name)
         sql_db.close_db(old_name)
 
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         cr.autocommit(True) # avoid transaction block
         try:
@@ -306,7 +306,7 @@ class db(netsvc.ExportService):
             raise openerp.exceptions.AccessDenied()
         chosen_template = tools.config['db_template']
         templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template]))
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         try:
             try:
@@ -544,7 +544,7 @@ GNU Public Licence.
         return http_server.list_http_services()
 
     def exp_check_connectivity(self):
-        return bool(sql_db.db_connect('template1'))
+        return bool(sql_db.db_connect('postgres'))
 
     def exp_get_os_time(self):
         return os.times()
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index d628447a7a8..a03937601dc 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -223,7 +223,7 @@ class configmanager(object):
                          help="specify the database port", type="int")
         group.add_option("--db_maxconn", dest="db_maxconn", type='int', my_default=64,
                          help="specify the the maximum number of physical connections to posgresql")
-        group.add_option("--db-template", dest="db_template", my_default="template0",
+        group.add_option("--db-template", dest="db_template", my_default="template1",
                          help="specify a custom database template to create a new database")
         parser.add_option_group(group)