From b405fdd235a7dcb40423229af033abd4687c72b2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 28 Aug 2011 16:07:38 +0200
Subject: Add support for creating connection from existing handle

This will allow for custom connection establishment and configuration.
---
 odb/pgsql/connection.cxx | 28 +++++++++++++++++++++-------
 odb/pgsql/connection.hxx |  5 +++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/odb/pgsql/connection.cxx b/odb/pgsql/connection.cxx
index 0a23ed7..be88446 100644
--- a/odb/pgsql/connection.cxx
+++ b/odb/pgsql/connection.cxx
@@ -31,10 +31,7 @@ namespace odb
   {
     connection::
     connection (database_type& db)
-        : odb::connection (db),
-          db_ (db),
-          handle_ (0),
-          statement_cache_ (new statement_cache_type (*this))
+        : odb::connection (db), db_ (db)
     {
       handle_ = PQconnectdb (db.conninfo ().c_str ());
 
@@ -48,16 +45,33 @@ namespace odb
         throw database_exception (m);
       }
 
-      // Suppress server notifications to stdout.
-      //
-      PQsetNoticeProcessor (handle_, &odb_pgsql_process_notice, 0);
+      init ();
+    }
+
+    connection::
+    connection (database_type& db, PGconn* handle)
+        : odb::connection (db), db_ (db), handle_ (handle)
+    {
+      init ();
+    }
 
+    void connection::
+    init ()
+    {
       // Establish whether date/time values are represented as
       // 8-byte integers.
       //
       if (strcmp (PQparameterStatus (handle_, "integer_datetimes"), "on") != 0)
         throw database_exception ("unsupported binary format for PostgreSQL "
                                   "date-time SQL types");
+
+      // Suppress server notifications to stdout.
+      //
+      PQsetNoticeProcessor (handle_, &odb_pgsql_process_notice, 0);
+
+      // Create statement cache.
+      //
+      statement_cache_.reset (new statement_cache_type (*this));
     }
 
     connection::
diff --git a/odb/pgsql/connection.hxx b/odb/pgsql/connection.hxx
index a44b328..063f8d4 100644
--- a/odb/pgsql/connection.hxx
+++ b/odb/pgsql/connection.hxx
@@ -43,6 +43,7 @@ namespace odb
       ~connection ();
 
       connection (database_type&);
+      connection (database_type&, PGconn* handle);
 
       database_type&
       database ()
@@ -78,6 +79,10 @@ namespace odb
       connection& operator= (const connection&);
 
     private:
+      void
+      init ();
+
+    private:
       database_type& db_;
       PGconn* handle_;
 
-- 
cgit v1.1