Merge lp:~ahasenack/charms/precise/postgresql/use-postgres-instead-of-template1 into lp:charms/postgresql

[Andreas Hasenack]

Use the postgres database instead of template1 so we don't block database creation by others.

Use the postgres database instead of template1 so we don't block database creation by others.

[Stuart Bishop (stub)]

As discussed on IRC, the reason for this change is that createdb uses template1 by default as its template database. If there are connections to the template database, and they can hang around for a few moments on the server after being closed by the client, the createdb will fail.

The simplest solutions are to either not open connections to the template database, or use template0 as the createdb template database. This fix does the former.

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-22 12:45:31 +0000
+++ hooks/hooks.py	2014-01-31 13:00:14 +0000
@@ -699,7 +699,7 @@
         return None
 
 
-def db_cursor(autocommit=False, db='template1', user='postgres',
+def db_cursor(autocommit=False, db='postgres', user='postgres',
               host=None, timeout=30):
     import psycopg2
     if host:
@@ -1962,7 +1962,7 @@
     return int(logid, 16) * 16 * 1024 * 1024 * 255 + int(offset, 16)
 
 
-def wait_for_db(timeout=120, db='template1', user='postgres', host=None):
+def wait_for_db(timeout=120, db='postgres', user='postgres', host=None):
     '''Wait until the db is fully up.'''
     db_cursor(db=db, user=user, host=host, timeout=timeout)