diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-11-09 18:14:37 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-11-09 18:14:37 +0200 |
commit | fc70be62d8698496a20b6947d102757f426c5b3e (patch) | |
tree | 92610ee68abf5a1fcc40e8717c4011628865c601 /odb/pgsql/connection.hxx | |
parent | f5f515acc2b926eb838b82b457f6b5979db5f309 (diff) |
Make database class move-constructible
This means it can be returned by value from a function in C++11.
Diffstat (limited to 'odb/pgsql/connection.hxx')
-rw-r--r-- | odb/pgsql/connection.hxx | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/odb/pgsql/connection.hxx b/odb/pgsql/connection.hxx index 78d8cd5..0f1d78c 100644 --- a/odb/pgsql/connection.hxx +++ b/odb/pgsql/connection.hxx @@ -27,6 +27,7 @@ namespace odb namespace pgsql { class statement_cache; + class connection_factory; class connection; typedef details::shared_ptr<connection> connection_ptr; @@ -40,14 +41,11 @@ namespace odb virtual ~connection (); - connection (database_type&); - connection (database_type&, PGconn* handle); + connection (connection_factory&); + connection (connection_factory&, PGconn* handle); database_type& - database () - { - return db_; - } + database (); public: virtual transaction_impl* @@ -135,11 +133,6 @@ namespace odb friend class transaction_impl; // invalidate_results() private: - // Needed to break the circular connection-database dependency - // (odb::connection has the odb::database member). - // - database_type& db_; - auto_handle<PGconn> handle_; bool failed_; @@ -148,6 +141,33 @@ namespace odb // details::unique_ptr<statement_cache_type> statement_cache_; }; + + class LIBODB_PGSQL_EXPORT connection_factory: + public odb::connection_factory + { + public: + typedef pgsql::database database_type; + + virtual void + database (database_type&); + + database_type& + database () {return *db_;} + + virtual connection_ptr + connect () = 0; + + virtual + ~connection_factory (); + + connection_factory (): db_ (0) {} + + // Needed to break the circular connection_factory-database dependency + // (odb::connection_factory has the odb::database member). + // + protected: + database_type* db_; + }; } } |