diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-11-21 13:11:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-11-21 13:13:50 +0200 |
| commit | 9ad0acf37561de9bf359a561faed53de17c2ca3b (patch) | |
| tree | 4b38b866a4917992a6e22cde9f22539e08d4ed9e /odb/relational/source.hxx | |
| parent | d01c8e22abea35477f21488613f2474a2e4e8fc7 (diff) | |
Add dynamic multi-database query support
Diffstat (limited to 'odb/relational/source.hxx')
| -rw-r--r-- | odb/relational/source.hxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index a9c5bb1..ed5f0e3 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -1325,7 +1325,7 @@ namespace relational else { db_type_id = member_database_type_id_->database_type_id (mi.m); - traits = string (db.string ()) + "::value_traits<\n " + traits = db.string () + "::value_traits<\n " + type + ",\n " + db_type_id + " >"; } @@ -1643,7 +1643,7 @@ namespace relational else { db_type_id = member_database_type_id_->database_type_id (mi.m); - traits = string (db.string ()) + "::value_traits<\n " + traits = db.string () + "::value_traits<\n " + type + ",\n " + db_type_id + " >"; } @@ -3245,6 +3245,8 @@ namespace relational // struct persist_statement_params: object_columns_base, virtual context { + typedef persist_statement_params base; + persist_statement_params (string& params, query_parameters& qp) : params_ (params), qp_ (qp) { @@ -3292,7 +3294,9 @@ namespace relational typedef class_ base; class_ () - : grow_base_ (index_), + : query_columns_type_ (false, false), + view_query_columns_type_ (false), + grow_base_ (index_), grow_member_ (index_), grow_version_member_ (index_, "version_"), grow_discriminator_member_ (index_, "discriminator_"), @@ -3314,6 +3318,8 @@ namespace relational class_ (class_ const&) : root_context (), //@@ -Wextra context (), + query_columns_type_ (false, false), + view_query_columns_type_ (false), grow_base_ (index_), grow_member_ (index_), grow_version_member_ (index_, "version_"), @@ -3607,6 +3613,9 @@ namespace relational } private: + instance<query_columns_type> query_columns_type_; + instance<view_query_columns_type> view_query_columns_type_; + size_t index_; instance<grow_base> grow_base_; traversal::inherits grow_base_inherits_; @@ -3669,7 +3678,7 @@ namespace relational if (embedded_schema) os << "#include <odb/schema-catalog-impl.hxx>" << endl; - if (options.multi_database () == multi_database::dynamic) + if (multi_dynamic) os << "#include <odb/function-table.hxx>" << endl; os << endl; |