From 9f994010f871ce0ea1aea58482ddef503cfc81c3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Oct 2012 16:09:08 +0200
Subject: Ground work for multi-database support

All generated code now includes database id. The database-specific
database class interface has been updated to include all the database
operations. The database-specific tests now use this interface.
---
 odb/pgsql/database.cxx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'odb/pgsql/database.cxx')

diff --git a/odb/pgsql/database.cxx b/odb/pgsql/database.cxx
index 4777f79..49f6178 100644
--- a/odb/pgsql/database.cxx
+++ b/odb/pgsql/database.cxx
@@ -27,7 +27,8 @@ namespace odb
               unsigned int port,
               const string& extra_conninfo,
               transfer_ptr<connection_factory> factory)
-        : user_ (user),
+        : odb::database (id_pgsql),
+          user_ (user),
           password_ (password),
           db_ (db),
           host_ (host),
@@ -74,7 +75,8 @@ namespace odb
               const string& socket_ext,
               const string& extra_conninfo,
               transfer_ptr<connection_factory> factory)
-        : user_ (user),
+        : odb::database (id_pgsql),
+          user_ (user),
           password_ (password),
           db_ (db),
           host_ (host),
@@ -116,7 +118,10 @@ namespace odb
 
     database::
     database (const string& conninfo, transfer_ptr<connection_factory> factory)
-        : port_ (0), conninfo_ (conninfo), factory_ (factory.transfer ())
+        : odb::database (id_pgsql),
+          port_ (0),
+          conninfo_ (conninfo),
+          factory_ (factory.transfer ())
     {
       if (!factory_)
         factory_.reset (new connection_pool_factory ());
@@ -130,7 +135,7 @@ namespace odb
               bool erase,
               const string& extra_conninfo,
               transfer_ptr<connection_factory> factory)
-        : port_ (0), factory_ (factory.transfer ())
+        : odb::database (id_pgsql), port_ (0), factory_ (factory.transfer ())
     {
       using namespace details;
 
-- 
cgit v1.1