From a2e7161733a0fd1b69a20b627cfab87dce2db2e5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 19 Jul 2011 19:39:45 +0200
Subject: Fix incorrect argument names, make accessor order consistent

---
 odb/pgsql/database.hxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/odb/pgsql/database.hxx b/odb/pgsql/database.hxx
index a8219d3..b4917cc 100644
--- a/odb/pgsql/database.hxx
+++ b/odb/pgsql/database.hxx
@@ -34,18 +34,18 @@ namespace odb
       typedef pgsql::connection connection_type;
 
     public:
-      database (const std::string& db,
-                const std::string& user,
+      database (const std::string& user,
                 const std::string& password,
+                const std::string& db,
                 const std::string& host = "",
                 unsigned int port = 0,
                 const std::string& extra_conninfo = "",
                 std::auto_ptr<connection_factory> factory =
                   std::auto_ptr<connection_factory> (0));
 
-      database (const std::string& db,
-                const std::string& user,
+      database (const std::string& user,
                 const std::string& password,
+                const std::string& db,
                 const std::string& host = "",
                 const std::string& socket_ext = "",
                 const std::string& extra_conninfo = "",
@@ -101,27 +101,27 @@ namespace odb
 
     public:
       const std::string&
-      host () const
+      user () const
       {
-        return host_;
+        return user_;
       }
 
       const std::string&
-      db () const
+      password () const
       {
-        return db_;
+        return password_;
       }
 
       const std::string&
-      user () const
+      db () const
       {
-        return user_;
+        return db_;
       }
 
       const std::string&
-      password () const
+      host () const
       {
-        return password_;
+        return host_;
       }
 
       unsigned int
-- 
cgit v1.1