diff --git a/doc/backends/odbc.html b/doc/backends/odbc.html
index 33f38b124..12dcf4e53 100644
--- a/doc/backends/odbc.html
+++ b/doc/backends/odbc.html
@@ -274,7 +274,13 @@ <h4 id="get_connection_string">get_connection_string()</h4>
 
 <h3 id="options">Configuration options</h3>
 
-<p>None</p>
+<p>This backend supports <code>odbc_option_driver_complete</code> option which can be passed to it via <code>connection_parameters</code> class. The value of this option is passed to <code>SQLDriverConnect()</code> function as "driver completion" parameter and so must be one of <code>SQL_DRIVER_XXX</code> values, in the string form. The default value of this option is <code>SQL_DRIVER_PROMPT</code> meaning that the driver will query the user for the user name and/or the password if they are not stored together with the connection. If this is undesirable for some reason, you can use <code>SQL_DRIVER_NOPROMPT</code> value for this option to suppress showing the message box:</p>
+
+<pre class="example">
+connection_parameters parameters("odbc", "DSN=mydb");
+parameters.set_option(odbc_option_driver_complete, "0" /* SQL_DRIVER_NOPROMPT */);
+session sql(parameters);
+</pre>
 
 <p class="copyright">Copyright &copy; 2013 Mateusz Loskot</p>
 <p class="copyright">Copyright &copy; 2004-2006 Maciej Sobczak, Stephen Hutton, David Courtney</p>
diff --git a/doc/connections.html b/doc/connections.html
index 9e02b3a27..d12167296 100644
--- a/doc/connections.html
+++ b/doc/connections.html
@@ -54,6 +54,14 @@ <h3>Connecting to the database</h3>
 
 <p>The last two constructors described above try to locate the shared library with the name <code>libsoci_ABC.so</code> (or <code>libsoci_ABC.dll</code> on Windows), where ABC is the backend name. In the above examples, the expected library name will be <code>libsoci_postgresql.so</code> for Unix-like systems.</p>
 
+<p>The most general form of the constructor takes a single object of <code>connection_parameters</code> type which contains a pointer to the backend to use, the connection string and also any connection options. Using this constructor is the only way to pass any non-default options to the backend. For example, to suppress any interactive prompts when using ODBC backend you could do:</p>
+<pre class="example">
+connection_parameters parameters("odbc", "DSN=mydb");
+parameters.set_option(odbc_option_driver_complete, "0" /* SQL_DRIVER_NOPROMPT */);
+session sql(parameters);
+</pre>
+Notice that you need to <code>#include &lt;soci-odbc.h&gt;</code> to obtain the option name declaration. The existing options are described in the backend-specific part of the documentation.
+
 <div class="note">
 <p><span class="note">Environment configuration:</span></p>
 <p>The <code>SOCI_BACKENDS_PATH</code> environment variable defines the set of paths where the shared libraries will be searched for. There can be many paths, separated by colons, and they are used from left to right until the library with the appropriate name is found. If this variable is not set or is empty, the current directory is used as a default path for dynamically loaded backends.</p>
@@ -86,6 +94,10 @@ <h3>Connecting to the database</h3>
 
 // or:
 sql.open("postgresql://dbname=mydb");
+
+// or also:
+connection_parameters parameters("postgresql", "dbname=mydb");
+sql.open(parameters);
 </pre>
 
 <p>The rules for backend naming are the same as with the constructors described above.</p>
diff --git a/doc/errors.html b/doc/errors.html
index ed59640de..5c147af53 100644
--- a/doc/errors.html
+++ b/doc/errors.html
@@ -118,7 +118,7 @@ <h2>Errors</h2>
       <a href="installation.html">Previous (Installation)</a>
     </td>
     <td class="foot-link-right">
-      <a href="basics.html">Next (Connections and simple queries)</a>
+      <a href="connections.html">Next (Connections and simple queries)</a>
     </td>
   </tr>
 </table>
diff --git a/doc/reference.html b/doc/reference.html
index 05b406293..d265f75e2 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -14,6 +14,7 @@ <h2>Client interface reference</h2>
 <div class="navigation">
 <a href="#commontypes">commonly used types</a><br />
 <a href="#session">class session</a><br />
+<a href="#parameters">class connection_parameters</a><br />
 <a href="#pool">class connection_pool</a><br />
 <a href="#transaction">class transaction</a><br />
 <a href="#into">function into</a><br />
@@ -75,6 +76,7 @@ <h3 id="session">class session</h3>
 {
 public:
     session();
+    explicit session(connection_parameters const &amp; parameters);
     session(backend_factory const &amp; factory, std::string const &amp; connectString);
     session(std::string const &amp; backendName, std::string const &amp; connectString);
     explicit session(std::string const &amp; connectString);
@@ -121,7 +123,9 @@ <h3 id="session">class session</h3>
 <ul>
   <li>Various constructors. The default one creates the session in the disconnected state.
   The others expect the backend factory object, or the backend name, or the URL-like
-  composed connection string. The last constructor creates a session proxy associated
+  composed connection string or the special parameters object containing both the backend
+  and the connection string as well as possibly other connection options.
+  The last constructor creates a session proxy associated
   with the session that is available in the given pool and releases it back to the pool
   when its lifetime ends. Example:
 <pre class="example">
@@ -198,6 +202,39 @@ <h3 id="session">class session</h3>
 <p>See <a href="basics.html">Connections and simple queries</a> for more
 examples.</p>
 
+<h3 id="parameters">class connection_parameters</h3>
+
+<p>The <code>connection_parameters</code> class is a simple container for the backend pointer, connection string and any other connection options. It is used together with <code>session</code> constructor and <code>open()</code> method.</p>
+
+<pre class="example">
+class connection_parameters
+{
+public:
+    connection_parameters();
+    connection_parameters(backend_factory const &amp; factory, std::string const &amp; connectString);
+    connection_parameters(std::string const &amp; backendName, std::string const &amp; connectString);
+    explicit connection_parameters(std::string const &amp; fullConnectString);
+
+    void set_option(const char * name, std::string const &amp; value);
+    bool get_option(const char * name, std::string &amp; value) const
+};
+</pre>
+
+<p>The methods of this class are:</p>
+<ul>
+    <li>Default constructor is rarely used as it creates an uninitialized
+    object and the only way to initialize it later is to assign another, valid,
+    connection_parameters object to this one.</li>
+    <li>The other constructors correspond to the similar constructors of the
+    <code>session</code> class and specify both the backend, either as a
+    pointer to it or by name, and the connection string.</li>
+    <li><code>set_option</code> can be used to set the value of an option with
+    the given name. Currently all option values are strings, so if you need to
+    set a numeric option you need to convert it to a string first. If an option
+    with the given name had been already set before, its old value is
+    overwritten.</li>
+</ul>
+
 <h3 id="pool">class connection_pool</h3>
 
 <p>The <code>connection_pool</code> class encapsulates the thread-safe pool of connections
diff --git a/src/backends/db2/factory.cpp b/src/backends/db2/factory.cpp
index ac76e2843..a94bb1e5f 100644
--- a/src/backends/db2/factory.cpp
+++ b/src/backends/db2/factory.cpp
@@ -16,9 +16,9 @@ using namespace soci::details;
 
 // concrete factory for ODBC concrete strategies
 db2_session_backend * db2_backend_factory::make_session(
-     std::string const &connectString) const
+     connection_parameters const & parameters) const
 {
-     return new db2_session_backend(connectString);
+     return new db2_session_backend(parameters);
 }
 
 db2_backend_factory const soci::db2;
diff --git a/src/backends/db2/session.cpp b/src/backends/db2/session.cpp
index 25538b918..2c82213f0 100644
--- a/src/backends/db2/session.cpp
+++ b/src/backends/db2/session.cpp
@@ -8,6 +8,7 @@
 
 #define SOCI_DB2_SOURCE
 #include "soci-db2.h"
+#include <connection-parameters.h>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
@@ -61,6 +62,7 @@ void db2_session_backend::parseKeyVal(std::string const & keyVal) {
     }
 }
 
+/* DSN=SAMPLE;Uid=db2inst1;Pwd=db2inst1;AutoCommit=off */
 void db2_session_backend::parseConnectString(std::string const &  connectString) {
     std::string processingString(connectString);
     size_t delimiter=processingString.find_first_of(";");
@@ -76,10 +78,10 @@ void db2_session_backend::parseConnectString(std::string const &  connectString)
 }
 
 db2_session_backend::db2_session_backend(
-    std::string const &  connectString /* DSN=SAMPLE;Uid=db2inst1;Pwd=db2inst1;AutoCommit=off */) :
+    connection_parameters const & parameters) :
         in_transaction(false)
 {
-    parseConnectString(connectString);
+    parseConnectString(parameters.get_connect_string());
     SQLRETURN cliRC = SQL_SUCCESS;
 
     /* Prepare handles */
diff --git a/src/backends/db2/soci-db2.h b/src/backends/db2/soci-db2.h
index 4bcc682b4..70ecb8b97 100644
--- a/src/backends/db2/soci-db2.h
+++ b/src/backends/db2/soci-db2.h
@@ -230,7 +230,7 @@ struct db2_blob_backend : details::blob_backend
 
 struct db2_session_backend : details::session_backend
 {
-    db2_session_backend(std::string const& connectString);
+    db2_session_backend(connection_parameters const& parameters);
 
     ~db2_session_backend();
 
@@ -262,7 +262,8 @@ struct db2_session_backend : details::session_backend
 struct SOCI_DB2_DECL db2_backend_factory : backend_factory
 {
 	db2_backend_factory() {}
-    db2_session_backend* make_session(std::string const& connectString) const;
+    db2_session_backend* make_session(
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_DB2_DECL db2_backend_factory const db2;
diff --git a/src/backends/empty/factory.cpp b/src/backends/empty/factory.cpp
index f880cf851..ed744dcb3 100644
--- a/src/backends/empty/factory.cpp
+++ b/src/backends/empty/factory.cpp
@@ -18,9 +18,9 @@ using namespace soci::details;
 
 // concrete factory for Empty concrete strategies
 empty_session_backend* empty_backend_factory::make_session(
-     std::string const& connectString) const
+     connection_parameters const& parameters) const
 {
-     return new empty_session_backend(connectString);
+     return new empty_session_backend(parameters);
 }
 
 empty_backend_factory const soci::empty;
diff --git a/src/backends/empty/session.cpp b/src/backends/empty/session.cpp
index 3c60dba1e..819547382 100644
--- a/src/backends/empty/session.cpp
+++ b/src/backends/empty/session.cpp
@@ -17,7 +17,7 @@ using namespace soci::details;
 
 
 empty_session_backend::empty_session_backend(
-    std::string const & /* connectString */)
+    connection_parameters const & /* parameters */)
 {
     // ...
 }
diff --git a/src/backends/empty/soci-empty.h b/src/backends/empty/soci-empty.h
index e3d5d5e45..ae63fe47a 100644
--- a/src/backends/empty/soci-empty.h
+++ b/src/backends/empty/soci-empty.h
@@ -154,7 +154,7 @@ struct empty_blob_backend : details::blob_backend
 
 struct empty_session_backend : details::session_backend
 {
-    empty_session_backend(std::string const& connectString);
+    empty_session_backend(connection_parameters const& parameters);
 
     ~empty_session_backend();
 
@@ -173,8 +173,8 @@ struct empty_session_backend : details::session_backend
 
 struct SOCI_EMPTY_DECL empty_backend_factory : backend_factory
 {
-	empty_backend_factory() {}
-    empty_session_backend* make_session(std::string const& connectString) const;
+    empty_backend_factory() {}
+    empty_session_backend* make_session(connection_parameters const& parameters) const;
 };
 
 extern SOCI_EMPTY_DECL empty_backend_factory const empty;
diff --git a/src/backends/firebird/factory.cpp b/src/backends/firebird/factory.cpp
index 7b2c88d2f..cea362b81 100644
--- a/src/backends/firebird/factory.cpp
+++ b/src/backends/firebird/factory.cpp
@@ -12,9 +12,9 @@
 using namespace soci;
 
 firebird_session_backend * firebird_backend_factory::make_session(
-    std::string const &connectString) const
+    connection_parameters const & parameters) const
 {
-    return new firebird_session_backend(connectString);
+    return new firebird_session_backend(parameters);
 }
 
 firebird_backend_factory const soci::firebird;
diff --git a/src/backends/firebird/session.cpp b/src/backends/firebird/session.cpp
index d8d163a37..6a0b8c78e 100644
--- a/src/backends/firebird/session.cpp
+++ b/src/backends/firebird/session.cpp
@@ -199,12 +199,12 @@ bool getISCConnectParameter(std::map<std::string, std::string> const & m, std::s
 } // namespace anonymous
 
 firebird_session_backend::firebird_session_backend(
-    std::string const & connectString) : dbhp_(0), trhp_(0)
+    connection_parameters const & parameters) : dbhp_(0), trhp_(0)
                                          , decimals_as_strings_(false)
 {
     // extract connection parameters
     std::map<std::string, std::string>
-        params(explodeISCConnectString(connectString));
+        params(explodeISCConnectString(parameters.get_connect_string()));
 
     ISC_STATUS stat[stat_size];
     std::string param;
diff --git a/src/backends/firebird/soci-firebird.h b/src/backends/firebird/soci-firebird.h
index 36e704e9a..192727898 100644
--- a/src/backends/firebird/soci-firebird.h
+++ b/src/backends/firebird/soci-firebird.h
@@ -291,7 +291,7 @@ struct firebird_blob_backend : details::blob_backend
 
 struct firebird_session_backend : details::session_backend
 {
-    firebird_session_backend(std::string const &connectString);
+    firebird_session_backend(connection_parameters const & parameters);
 
     ~firebird_session_backend();
 
@@ -322,9 +322,9 @@ struct firebird_session_backend : details::session_backend
 
 struct firebird_backend_factory : backend_factory
 {
-	firebird_backend_factory() {}
+    firebird_backend_factory() {}
     virtual firebird_session_backend * make_session(
-        std::string const &connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_FIREBIRD_DECL firebird_backend_factory const firebird;
diff --git a/src/backends/mysql/factory.cpp b/src/backends/mysql/factory.cpp
index ee8e41720..2940f0ab1 100644
--- a/src/backends/mysql/factory.cpp
+++ b/src/backends/mysql/factory.cpp
@@ -21,9 +21,9 @@ using namespace soci::details;
 
 // concrete factory for MySQL concrete strategies
 mysql_session_backend * mysql_backend_factory::make_session(
-     std::string const &connectString) const
+     connection_parameters const & parameters) const
 {
-     return new mysql_session_backend(connectString);
+     return new mysql_session_backend(parameters);
 }
 
 mysql_backend_factory const soci::mysql;
diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp
index cb96d7cd1..20b70bca6 100644
--- a/src/backends/mysql/session.cpp
+++ b/src/backends/mysql/session.cpp
@@ -8,6 +8,7 @@
 
 #define SOCI_MYSQL_SOURCE
 #include "soci-mysql.h"
+#include <connection-parameters.h>
 // std
 #include <cctype>
 #include <cerrno>
@@ -272,14 +273,14 @@ void parse_connect_string(const string & connectString,
 } // namespace anonymous
 
 mysql_session_backend::mysql_session_backend(
-    std::string const & connectString)
+    connection_parameters const & parameters)
 {
     string host, user, password, db, unix_socket, ssl_ca, ssl_cert, ssl_key,
         charset;
     int port, local_infile;
     bool host_p, user_p, password_p, db_p, unix_socket_p, port_p,
         ssl_ca_p, ssl_cert_p, ssl_key_p, local_infile_p, charset_p;
-    parse_connect_string(connectString, &host, &host_p, &user, &user_p,
+    parse_connect_string(parameters.get_connect_string(), &host, &host_p, &user, &user_p,
         &password, &password_p, &db, &db_p,
         &unix_socket, &unix_socket_p, &port, &port_p,
         &ssl_ca, &ssl_ca_p, &ssl_cert, &ssl_cert_p, &ssl_key, &ssl_key_p,
diff --git a/src/backends/mysql/soci-mysql.h b/src/backends/mysql/soci-mysql.h
index aa79896a2..cd9eeaa81 100644
--- a/src/backends/mysql/soci-mysql.h
+++ b/src/backends/mysql/soci-mysql.h
@@ -228,7 +228,7 @@ struct mysql_blob_backend : details::blob_backend
 
 struct mysql_session_backend : details::session_backend
 {
-    mysql_session_backend(std::string const &connectString);
+    mysql_session_backend(connection_parameters const & parameters);
 
     ~mysql_session_backend();
 
@@ -250,9 +250,9 @@ struct mysql_session_backend : details::session_backend
 
 struct mysql_backend_factory : backend_factory
 {
-	mysql_backend_factory() {}
+    mysql_backend_factory() {}
     virtual mysql_session_backend * make_session(
-        std::string const &connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_MYSQL_DECL mysql_backend_factory const mysql;
diff --git a/src/backends/odbc/factory.cpp b/src/backends/odbc/factory.cpp
index 97189d415..27f0d04d8 100644
--- a/src/backends/odbc/factory.cpp
+++ b/src/backends/odbc/factory.cpp
@@ -15,9 +15,9 @@ using namespace soci::details;
 
 // concrete factory for ODBC concrete strategies
 odbc_session_backend * odbc_backend_factory::make_session(
-     std::string const &connectString) const
+     connection_parameters const & parameters) const
 {
-     return new odbc_session_backend(connectString);
+     return new odbc_session_backend(parameters);
 }
 
 odbc_backend_factory const soci::odbc;
diff --git a/src/backends/odbc/session.cpp b/src/backends/odbc/session.cpp
index cf95ee4a6..4f51777fe 100644
--- a/src/backends/odbc/session.cpp
+++ b/src/backends/odbc/session.cpp
@@ -9,10 +9,15 @@
 #include "soci-odbc.h"
 #include "session.h"
 
+#include <cstdio>
+
 using namespace soci;
 using namespace soci::details;
 
-odbc_session_backend::odbc_session_backend(std::string const & connectString)
+char const * soci::odbc_option_driver_complete = "odbc.driver_complete";
+
+odbc_session_backend::odbc_session_backend(
+    connection_parameters const & parameters)
     : henv_(0), hdbc_(0), product_(prod_uninitialized)
 {
     SQLRETURN rc;
@@ -43,11 +48,36 @@ odbc_session_backend::odbc_session_backend(std::string const & connectString)
     SQLCHAR outConnString[1024];
     SQLSMALLINT strLength;
 
-    rc = SQLDriverConnect(hdbc_, NULL, // windows handle
+    // Prompt the user for any missing information (typically UID/PWD) in the
+    // connection string by default but allow overriding this using "prompt"
+    // option.
+    SQLHWND hwnd_for_prompt = NULL;
+    unsigned completion = SQL_DRIVER_COMPLETE;
+    std::string completionString;
+    if (parameters.get_option(odbc_option_driver_complete, completionString))
+    {
+      // The value of the option is supposed to be just the integer value of
+      // one of SQL_DRIVER_XXX constants but don't check for the exact value in
+      // case more of them are added in the future, the ODBC driver will return
+      // an error if we pass it an invalid value anyhow.
+      if (std::sscanf(completionString.c_str(), "%u", &completion) != 1)
+      {
+        throw soci_error("Invalid non-numeric driver completion option value \"" +
+                          completionString + "\".");
+      }
+    }
+
+#ifdef _WIN32
+    if (completion != SQL_DRIVER_NOPROMPT)
+      hwnd_for_prompt = ::GetDesktopWindow();
+#endif // _WIN32
+
+    std::string const & connectString = parameters.get_connect_string();
+    rc = SQLDriverConnect(hdbc_, hwnd_for_prompt,
                           (SQLCHAR *)connectString.c_str(),
                           (SQLSMALLINT)connectString.size(),
-                          outConnString, 1024,
-                          &strLength, SQL_DRIVER_NOPROMPT);
+                          outConnString, 1024, &strLength,
+                          static_cast<SQLUSMALLINT>(completion));
 
     if (is_odbc_error(rc))
     {
diff --git a/src/backends/odbc/soci-odbc.h b/src/backends/odbc/soci-odbc.h
index 2a47c5159..d97629b70 100644
--- a/src/backends/odbc/soci-odbc.h
+++ b/src/backends/odbc/soci-odbc.h
@@ -40,6 +40,12 @@ namespace details
     std::size_t const odbc_max_buffer_length = 100 * 1024 * 1024;
 }
 
+// Option allowing to specify the "driver completion" parameter of
+// SQLDriverConnect(). Its possible values are the same as the allowed values
+// for this parameter in the official ODBC, i.e. one of SQL_DRIVER_XXX (in
+// string form as all options are strings currently).
+extern SOCI_ODBC_DECL char const * odbc_option_driver_complete;
+
 struct odbc_statement_backend;
 
 // Helper of into and use backends.
@@ -259,7 +265,7 @@ struct odbc_blob_backend : details::blob_backend
 
 struct odbc_session_backend : details::session_backend
 {
-    odbc_session_backend(std::string const &connectString);
+    odbc_session_backend(connection_parameters const & parameters);
 
     ~odbc_session_backend();
 
@@ -403,9 +409,9 @@ inline bool odbc_standard_type_backend_base::use_string_for_bigint() const
 
 struct odbc_backend_factory : backend_factory
 {
-	odbc_backend_factory() {}
+    odbc_backend_factory() {}
     virtual odbc_session_backend * make_session(
-        std::string const &connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_ODBC_DECL odbc_backend_factory const odbc;
diff --git a/src/backends/oracle/factory.cpp b/src/backends/oracle/factory.cpp
index 7e76bb0ff..7c8098967 100644
--- a/src/backends/oracle/factory.cpp
+++ b/src/backends/oracle/factory.cpp
@@ -7,6 +7,7 @@
 
 #define SOCI_ORACLE_SOURCE
 #include "soci-oracle.h"
+#include <connection-parameters.h>
 #include <backend-loader.h>
 #include <cctype>
 #include <cstdio>
@@ -106,13 +107,13 @@ void chop_connect_string(std::string const & connectString,
 
 // concrete factory for Empty concrete strategies
 oracle_session_backend * oracle_backend_factory::make_session(
-     std::string const &connectString) const
+     connection_parameters const & parameters) const
 {
     std::string serviceName, userName, password;
     int mode;
     bool decimals_as_strings;
 
-    chop_connect_string(connectString, serviceName, userName, password,
+    chop_connect_string(parameters.get_connect_string(), serviceName, userName, password,
             mode, decimals_as_strings);
 
     return new oracle_session_backend(serviceName, userName, password,
diff --git a/src/backends/oracle/soci-oracle.h b/src/backends/oracle/soci-oracle.h
index d59d6fe0e..c6ffb60a1 100644
--- a/src/backends/oracle/soci-oracle.h
+++ b/src/backends/oracle/soci-oracle.h
@@ -274,9 +274,9 @@ struct oracle_session_backend : details::session_backend
 
 struct oracle_backend_factory : backend_factory
 {
-	oracle_backend_factory() {}
+	  oracle_backend_factory() {}
     virtual oracle_session_backend * make_session(
-        std::string const &connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_ORACLE_DECL oracle_backend_factory const oracle;
diff --git a/src/backends/postgresql/factory.cpp b/src/backends/postgresql/factory.cpp
index b80d5bcf6..fe845985a 100644
--- a/src/backends/postgresql/factory.cpp
+++ b/src/backends/postgresql/factory.cpp
@@ -23,9 +23,9 @@ using namespace soci::details;
 
 // concrete factory for Empty concrete strategies
 postgresql_session_backend * postgresql_backend_factory::make_session(
-     std::string const & connectString) const
+     connection_parameters const & parameters) const
 {
-     return new postgresql_session_backend(connectString);
+     return new postgresql_session_backend(parameters);
 }
 
 postgresql_backend_factory const soci::postgresql;
diff --git a/src/backends/postgresql/session.cpp b/src/backends/postgresql/session.cpp
index e66fd0b23..c56a4b0b5 100644
--- a/src/backends/postgresql/session.cpp
+++ b/src/backends/postgresql/session.cpp
@@ -8,6 +8,7 @@
 #define SOCI_POSTGRESQL_SOURCE
 #include "soci-postgresql.h"
 #include "error.h"
+#include <connection-parameters.h>
 #include <libpq/libpq-fs.h> // libpq
 #include <cctype>
 #include <cstdio>
@@ -27,10 +28,11 @@ using namespace soci;
 using namespace soci::details;
 using namespace soci::details::postgresql;
 
-postgresql_session_backend::postgresql_session_backend(std::string const& connectString)
+postgresql_session_backend::postgresql_session_backend(
+    connection_parameters const& parameters)
     : statementCount_(0)
 {
-    PGconn* conn = PQconnectdb(connectString.c_str());
+    PGconn* conn = PQconnectdb(parameters.get_connect_string().c_str());
     if (0 == conn || CONNECTION_OK != PQstatus(conn))
     {
         std::string msg = "Cannot establish connection to the database.";
diff --git a/src/backends/postgresql/soci-postgresql.h b/src/backends/postgresql/soci-postgresql.h
index 1508f9b29..14add2189 100644
--- a/src/backends/postgresql/soci-postgresql.h
+++ b/src/backends/postgresql/soci-postgresql.h
@@ -229,7 +229,7 @@ struct postgresql_blob_backend : details::blob_backend
 
 struct postgresql_session_backend : details::session_backend
 {
-    postgresql_session_backend(std::string const & connectString);
+    postgresql_session_backend(connection_parameters const & parameters);
 
     ~postgresql_session_backend();
 
@@ -258,7 +258,7 @@ struct postgresql_backend_factory : backend_factory
 {
     postgresql_backend_factory() {}
     virtual postgresql_session_backend * make_session(
-        std::string const & connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_POSTGRESQL_DECL postgresql_backend_factory const postgresql;
diff --git a/src/backends/sqlite3/factory.cpp b/src/backends/sqlite3/factory.cpp
index 734f12d3b..02691f597 100644
--- a/src/backends/sqlite3/factory.cpp
+++ b/src/backends/sqlite3/factory.cpp
@@ -18,9 +18,9 @@ using namespace soci::details;
 
 // concrete factory for Empty concrete strategies
 sqlite3_session_backend * sqlite3_backend_factory::make_session(
-     std::string const &connectString) const
+     connection_parameters const & parameters) const
 {
-     return new sqlite3_session_backend(connectString);
+     return new sqlite3_session_backend(parameters);
 }
 
 sqlite3_backend_factory const soci::sqlite3;
diff --git a/src/backends/sqlite3/session.cpp b/src/backends/sqlite3/session.cpp
index 4e9487cce..84c19901c 100644
--- a/src/backends/sqlite3/session.cpp
+++ b/src/backends/sqlite3/session.cpp
@@ -8,6 +8,8 @@
 
 #include "soci-sqlite3.h"
 
+#include <connection-parameters.h>
+
 #include <sstream>
 #include <string>
 
@@ -40,10 +42,11 @@ void execude_hardcoded(sqlite_api::sqlite3* conn, char const* const query, char
 
 
 sqlite3_session_backend::sqlite3_session_backend(
-    std::string const & connectString)
+    connection_parameters const & parameters)
 {
     int timeout = 0;
     std::string synchronous;
+    std::string const & connectString = parameters.get_connect_string();
     std::string dbname(connectString);
     std::stringstream ssconn(connectString);
     while (!ssconn.eof() && ssconn.str().find('=') != std::string::npos)
diff --git a/src/backends/sqlite3/soci-sqlite3.h b/src/backends/sqlite3/soci-sqlite3.h
index 3f9d2fe4a..87d2d9803 100644
--- a/src/backends/sqlite3/soci-sqlite3.h
+++ b/src/backends/sqlite3/soci-sqlite3.h
@@ -234,7 +234,7 @@ struct sqlite3_blob_backend : details::blob_backend
 
 struct sqlite3_session_backend : details::session_backend
 {
-    sqlite3_session_backend(std::string const &connectString);
+    sqlite3_session_backend(connection_parameters const & parameters);
 
     ~sqlite3_session_backend();
 
@@ -255,9 +255,9 @@ struct sqlite3_session_backend : details::session_backend
 
 struct sqlite3_backend_factory : backend_factory
 {
-	sqlite3_backend_factory() {}
+    sqlite3_backend_factory() {}
     virtual sqlite3_session_backend * make_session(
-        std::string const &connectString) const;
+        connection_parameters const & parameters) const;
 };
 
 extern SOCI_SQLITE3_DECL sqlite3_backend_factory const sqlite3;
diff --git a/src/core/connection-parameters.cpp b/src/core/connection-parameters.cpp
new file mode 100644
index 000000000..30d3e2fa4
--- /dev/null
+++ b/src/core/connection-parameters.cpp
@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2013 Vadim Zeitlin
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#define SOCI_SOURCE
+#include "connection-parameters.h"
+#include "soci-backend.h"
+#include "backend-loader.h"
+
+using namespace soci;
+
+namespace // anonymous
+{
+
+void parseConnectString(std::string const & connectString,
+    std::string & backendName,
+    std::string & connectionParameters)
+{
+    std::string const protocolSeparator = "://";
+
+    std::string::size_type const p = connectString.find(protocolSeparator);
+    if (p == std::string::npos)
+    {
+        throw soci_error("No backend name found in " + connectString);
+    }
+
+    backendName = connectString.substr(0, p);
+    connectionParameters = connectString.substr(p + protocolSeparator.size());
+}
+
+} // namespace anonymous
+
+connection_parameters::connection_parameters()
+    : factory_(NULL)
+{
+}
+
+connection_parameters::connection_parameters(backend_factory const & factory,
+    std::string const & connectString)
+    : factory_(&factory), connectString_(connectString)
+{
+}
+
+connection_parameters::connection_parameters(std::string const & backendName,
+    std::string const & connectString)
+    : factory_(&dynamic_backends::get(backendName)), connectString_(connectString)
+{
+}
+
+connection_parameters::connection_parameters(std::string const & fullConnectString)
+{
+    std::string backendName;
+    std::string connectString;
+
+    parseConnectString(fullConnectString, backendName, connectString);
+
+    factory_ = &dynamic_backends::get(backendName);
+    connectString_ = connectString;
+}
diff --git a/src/core/connection-parameters.h b/src/core/connection-parameters.h
new file mode 100644
index 000000000..86483a33a
--- /dev/null
+++ b/src/core/connection-parameters.h
@@ -0,0 +1,68 @@
+//
+// Copyright (C) 2013 Vadim Zeitlin
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef SOCI_CONNECTION_PARAMETERS_H_INCLUDED
+#define SOCI_CONNECTION_PARAMETERS_H_INCLUDED
+
+#include "soci-config.h"
+
+#include <map>
+#include <string>
+
+namespace soci
+{
+
+class backend_factory;
+
+// Simple container for the information used when opening a session.
+class SOCI_DECL connection_parameters
+{
+public:
+    connection_parameters();
+    connection_parameters(backend_factory const & factory, std::string const & connectString);
+    connection_parameters(std::string const & backendName, std::string const & connectString);
+    explicit connection_parameters(std::string const & fullConnectString);
+
+    // Default copy ctor, assignment operator and dtor are all OK for us.
+
+
+    // Retrieve the backend and the connection strings specified in the ctor.
+    backend_factory const * get_factory() const { return factory_; }
+    std::string const & get_connect_string() const { return connectString_; }
+
+    // Set the value of the given option, overwriting any previous value.
+    void set_option(const char * name, std::string const & value)
+    {
+        options_[name] = value;
+    }
+
+    // Return true if the option with the given name was found and fill the
+    // provided parameter with its value.
+    bool get_option(const char * name, std::string & value) const
+    {
+        Options::const_iterator const it = options_.find(name);
+        if (it == options_.end())
+            return false;
+
+        value = it->second;
+
+        return true;
+    }
+
+private:
+    // The backend and connection string specified in our ctor.
+    backend_factory const * factory_;
+    std::string connectString_;
+
+    // We store all the values as strings for simplicity.
+    typedef std::map<const char*, std::string> Options;
+    Options options_;
+};
+
+} // namespace soci
+
+#endif // SOCI_CONNECTION_PARAMETERS_H_INCLUDED
diff --git a/src/core/session.cpp b/src/core/session.cpp
index bc85cb409..9244a54f6 100644
--- a/src/core/session.cpp
+++ b/src/core/session.cpp
@@ -7,9 +7,9 @@
 
 #define SOCI_SOURCE
 #include "session.h"
+#include "connection-parameters.h"
 #include "connection-pool.h"
 #include "soci-backend.h"
-#include "backend-loader.h"
 #include "query_transformation.h"
 
 #ifdef _MSC_VER
@@ -22,22 +22,6 @@ using namespace soci::details;
 namespace // anonymous
 {
 
-void parseConnectString(std::string const & connectString,
-    std::string & backendName,
-    std::string & connectionParameters)
-{
-    std::string const protocolSeparator = "://";
-
-    std::string::size_type const p = connectString.find(protocolSeparator);
-    if (p == std::string::npos)
-    {
-        throw soci_error("No backend name found in " + connectString);
-    }
-
-    backendName = connectString.substr(0, p);
-    connectionParameters = connectString.substr(p + protocolSeparator.size());
-}
-
 void ensureConnected(session_backend * backEnd)
 {
     if (backEnd == NULL)
@@ -50,51 +34,47 @@ void ensureConnected(session_backend * backEnd)
 
 session::session()
     : once(this), prepare(this), query_transformation_(NULL), logStream_(NULL),
-      lastFactory_(NULL), uppercaseColumnNames_(false), backEnd_(NULL),
+      uppercaseColumnNames_(false), backEnd_(NULL),
       isFromPool_(false), pool_(NULL)
 {
 }
 
+session::session(connection_parameters const & parameters)
+    : once(this), prepare(this), query_transformation_(NULL), logStream_(NULL),
+      lastConnectParameters_(parameters),
+      uppercaseColumnNames_(false), backEnd_(NULL),
+      isFromPool_(false), pool_(NULL)
+{
+    open(lastConnectParameters_);
+}
+
 session::session(backend_factory const & factory,
     std::string const & connectString)
     : once(this), prepare(this), query_transformation_(NULL), logStream_(NULL),
-      lastFactory_(&factory), lastConnectString_(connectString),
-      uppercaseColumnNames_(false),
+      lastConnectParameters_(factory, connectString),
+      uppercaseColumnNames_(false), backEnd_(NULL),
       isFromPool_(false), pool_(NULL)
 {
-    backEnd_ = factory.make_session(connectString);
+    open(lastConnectParameters_);
 }
 
 session::session(std::string const & backendName,
     std::string const & connectString)
     : once(this), prepare(this), query_transformation_(NULL), logStream_(NULL),
-      uppercaseColumnNames_(false),
+      lastConnectParameters_(backendName, connectString),
+      uppercaseColumnNames_(false), backEnd_(NULL),
       isFromPool_(false), pool_(NULL)
 {
-    backend_factory const & factory = dynamic_backends::get(backendName);
-
-    lastFactory_ = &factory;
-    lastConnectString_ = connectString;
-
-    backEnd_ = factory.make_session(connectString);
+    open(lastConnectParameters_);
 }
 
 session::session(std::string const & connectString)
     : once(this), prepare(this), query_transformation_(NULL), logStream_(NULL),
-      uppercaseColumnNames_(false),
+      lastConnectParameters_(connectString),
+      uppercaseColumnNames_(false), backEnd_(NULL),
       isFromPool_(false), pool_(NULL)
 {
-    std::string backendName;
-    std::string connectionParameters;
-
-    parseConnectString(connectString, backendName, connectionParameters);
-
-    backend_factory const & factory = dynamic_backends::get(backendName);
-
-    lastFactory_ = &factory;
-    lastConnectString_ = connectionParameters;
-
-    backEnd_ = factory.make_session(connectionParameters);
+    open(lastConnectParameters_);
 }
 
 session::session(connection_pool & pool)
@@ -121,13 +101,11 @@ session::~session()
     }
 }
 
-void session::open(backend_factory const & factory,
-    std::string const & connectString)
+void session::open(connection_parameters const & parameters)
 {
     if (isFromPool_)
     {
-        pool_->at(poolPosition_).open(factory, connectString);
-        backEnd_ = pool_->at(poolPosition_).get_backend();
+        pool_->at(poolPosition_).open(parameters);
     }
     else
     {
@@ -136,60 +114,32 @@ void session::open(backend_factory const & factory,
             throw soci_error("Cannot open already connected session.");
         }
 
-        backEnd_ = factory.make_session(connectString);
-        lastFactory_ = &factory;
-        lastConnectString_ = connectString;
+        backend_factory const * const factory = parameters.get_factory();
+        if (factory == NULL)
+        {
+            throw soci_error("Cannot connect without a valid backend.");
+        }
+
+        backEnd_ = factory->make_session(parameters);
+        lastConnectParameters_ = parameters;
     }
 }
 
-void session::open(std::string const & backendName,
+void session::open(backend_factory const & factory,
     std::string const & connectString)
 {
-    if (isFromPool_)
-    {
-        pool_->at(poolPosition_).open(backendName, connectString);
-        backEnd_ = pool_->at(poolPosition_).get_backend();
-    }
-    else
-    {
-        if (backEnd_ != NULL)
-        {
-            throw soci_error("Cannot open already connected session.");
-        }
-
-        backend_factory const & factory = dynamic_backends::get(backendName);
+    open(connection_parameters(factory, connectString));
+}
 
-        backEnd_ = factory.make_session(connectString);
-        lastFactory_ = &factory;
-        lastConnectString_ = connectString;
-    }
+void session::open(std::string const & backendName,
+    std::string const & connectString)
+{
+    open(connection_parameters(backendName, connectString));
 }
 
 void session::open(std::string const & connectString)
 {
-    if (isFromPool_)
-    {
-        pool_->at(poolPosition_).open(connectString);
-        backEnd_ = pool_->at(poolPosition_).get_backend();
-    }
-    else
-    {
-        if (backEnd_ != NULL)
-        {
-            throw soci_error("Cannot open already connected session.");
-        }
-
-        std::string backendName;
-        std::string connectionParameters;
-
-        parseConnectString(connectString, backendName, connectionParameters);
-
-        backend_factory const & factory = dynamic_backends::get(backendName);
-
-        backEnd_ = factory.make_session(connectionParameters);
-        lastFactory_ = &factory;
-        lastConnectString_ = connectionParameters;
-    }
+    open(connection_parameters(connectString));
 }
 
 void session::close()
@@ -215,7 +165,8 @@ void session::reconnect()
     }
     else
     {
-        if (lastFactory_ == NULL)
+        backend_factory const * const lastFactory = lastConnectParameters_.get_factory();
+        if (lastFactory == NULL)
         {
             throw soci_error("Cannot reconnect without previous connection.");
         }
@@ -225,7 +176,7 @@ void session::reconnect()
             close();
         }
 
-        backEnd_ = lastFactory_->make_session(lastConnectString_);
+        backEnd_ = lastFactory->make_session(lastConnectParameters_);
     }
 }
 
diff --git a/src/core/session.h b/src/core/session.h
index 4b9e159f2..ef587cbce 100644
--- a/src/core/session.h
+++ b/src/core/session.h
@@ -10,6 +10,7 @@
 
 #include "once-temp-type.h"
 #include "query_transformation.h"
+#include "connection-parameters.h"
 
 // std
 #include <cstddef>
@@ -20,7 +21,7 @@
 namespace soci
 {
 class values;
-struct backend_factory;
+class backend_factory;
 
 namespace details
 {
@@ -38,6 +39,7 @@ class SOCI_DECL session
 {
 public:
     session();
+    explicit session(connection_parameters const & parameters);
     session(backend_factory const & factory, std::string const & connectString);
     session(std::string const & backendName, std::string const & connectString);
     explicit session(std::string const & connectString);
@@ -45,6 +47,7 @@ class SOCI_DECL session
 
     ~session();
 
+    void open(connection_parameters const & parameters);
     void open(backend_factory const & factory, std::string const & connectString);
     void open(std::string const & backendName, std::string const & connectString);
     void open(std::string const & connectString);
@@ -122,8 +125,7 @@ class SOCI_DECL session
     std::ostream * logStream_;
     std::string lastQuery_;
 
-    backend_factory const * lastFactory_;
-    std::string lastConnectString_;
+    connection_parameters lastConnectParameters_;
 
     bool uppercaseColumnNames_;
 
diff --git a/src/core/soci-backend.h b/src/core/soci-backend.h
index b39b9cde7..75edee4ad 100644
--- a/src/core/soci-backend.h
+++ b/src/core/soci-backend.h
@@ -260,13 +260,16 @@ class session_backend
 
 // simple base class for the session back-end factory
 
-struct SOCI_DECL backend_factory
+class connection_parameters;
+
+class SOCI_DECL backend_factory
 {
+public:
     backend_factory() {}
     virtual ~backend_factory() {}
 
     virtual details::session_backend* make_session(
-        std::string const& connectString) const = 0;
+        connection_parameters const& parameters) const = 0;
 };
 
 } // namespace soci