From ef9615aebb8a7b504c3b5cd2610e3c8f5bb4de58 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 15 Dec 2015 13:38:57 +0200
Subject: Various cleanups and improvements, INSTALL-DEV instructions

---
 brep/shared-database.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'brep/shared-database.cxx')

diff --git a/brep/shared-database.cxx b/brep/shared-database.cxx
index db6b811..1389dab 100644
--- a/brep/shared-database.cxx
+++ b/brep/shared-database.cxx
@@ -14,7 +14,7 @@
 namespace brep
 {
   shared_ptr<odb::database>
-  shared_database (const string& h, unsigned int p)
+  shared_database (const options::db& o)
   {
     using odb::pgsql::database;
     static weak_ptr<database> db;
@@ -25,14 +25,22 @@ namespace brep
     //
     if (shared_ptr<database> d = db.lock ())
     {
-      if (h != d->host () || p != d->port ())
+      if (o.db_user ()     != d->user ()     ||
+          o.db_password () != d->password () ||
+          o.db_name ()     != d->db ()       ||
+          o.db_host ()     != d->host ()     ||
+          o.db_port ()     != d->port ())
         throw std::runtime_error ("shared database host/port mismatch");
 
       return d;
     }
     else
     {
-      d = make_shared<database> ("", "", "brep", h, p);
+      d = make_shared<database> (o.db_user (),
+                                 o.db_password (),
+                                 o.db_name (),
+                                 o.db_host (),
+                                 o.db_port ());
       db = d;
       return d;
     }
-- 
cgit v1.1