[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi] server/src/storage: Default DB is "postgres" not template1 (now)
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2013-09-30 17:57:49
Message-ID: E1VQhjB-00032t-6E () scm ! kde ! org
[Download RAW message or body]

Git commit d507cf5ea5190a7e0887cff06e60369a6b5e533a by Dan Vrátil, on behalf of Cédric Villemain.
Committed on 30/09/2013 at 17:55.
Pushed by dvratil into branch 'master'.

Default DB is "postgres" not template1 (now)

In the past the postgres DB may not exist after cluster initialization.
Now all stables default to create 2 templates (0 and 1) and a postgres
database for admin requirements.

REVIEW: 112974

M  +2    -2    server/src/storage/dbconfigpostgresql.cpp

http://commits.kde.org/akonadi/d507cf5ea5190a7e0887cff06e60369a6b5e533a

diff --git a/server/src/storage/dbconfigpostgresql.cpp b/server/src/storage/dbconfigpostgresql.cpp
index f410208..b58a1a0 100644
--- a/server/src/storage/dbconfigpostgresql.cpp
+++ b/server/src/storage/dbconfigpostgresql.cpp
@@ -204,8 +204,8 @@ void DbConfigPostgresql::startInternalServer()
     QSqlDatabase db = QSqlDatabase::addDatabase( QLatin1String( "QPSQL" ), initCon );
     apply( db );
 
-    // use the dummy database that is always available
-    db.setDatabaseName( QLatin1String( "template1" ) );
+    // use the default database that is always available
+    db.setDatabaseName( QLatin1String( "postgres" ) );
 
     if ( !db.isValid() ) {
       akFatal() << "Invalid database object during database server startup";
[prev in list] [next in list] [prev in thread] [next in thread]