diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-14 16:24:50 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-14 16:24:50 +0200 |
commit | 4bf55482207ee5807907833829dc30af2d18770b (patch) | |
tree | 063c5f1142cc5a3d0d9c2824241801d3e5203bea /odb/relational/mssql | |
parent | 5c836364144998dcd2d798f6bc404b0f0efddf5c (diff) |
Old interface compatibility and testing fixes
Now all tests pass for both Oracle and SQL Server.
Diffstat (limited to 'odb/relational/mssql')
-rw-r--r-- | odb/relational/mssql/header.cxx | 29 | ||||
-rw-r--r-- | odb/relational/mssql/source.cxx | 57 |
2 files changed, 82 insertions, 4 deletions
diff --git a/odb/relational/mssql/header.cxx b/odb/relational/mssql/header.cxx index f943a8a..40b6828 100644 --- a/odb/relational/mssql/header.cxx +++ b/odb/relational/mssql/header.cxx @@ -31,6 +31,11 @@ namespace relational if (poly_derived || (abst && !poly)) return; + // batch + // + os << "static const std::size_t batch = 1UL;" + << endl; + // rowvesion // bool rv (false); @@ -43,6 +48,30 @@ namespace relational os << "static const bool rowversion = " << rv << ";" << endl; } + + virtual void + object_public_extra_post (type& c) + { + bool abst (abstract (c)); + + type* poly_root (polymorphic (c)); + bool poly (poly_root != 0); + bool poly_derived (poly && poly_root != &c); + + if (poly_derived || (abst && !poly)) + return; + + if (semantics::data_member* m = optimistic (c)) + { + sql_type t (parse_sql_type (column_type (*m), *m)); + if (t.type == sql_type::ROWVERSION) + { + os << "static version_type" << endl + << "version (const id_image_type&);" + << endl; + } + } + } }; entry<class1> class1_entry_; diff --git a/odb/relational/mssql/source.cxx b/odb/relational/mssql/source.cxx index 83096ab..e40a189 100644 --- a/odb/relational/mssql/source.cxx +++ b/odb/relational/mssql/source.cxx @@ -905,7 +905,7 @@ namespace relational sql_type t (parse_sql_type (column_type (m), m)); return t.type != sql_type::ROWVERSION ? "1" - : "sts.update_statement ().version ()"; + : "version (sts.id_image ())"; } virtual string @@ -933,7 +933,8 @@ namespace relational struct class_: relational::class_, statement_columns_common { - class_ (base const& x): base (x) {} + class_ (base const& x): + base (x), init_version_value_member_id_image_ ("v", "version_") {} virtual void init_image_pre (type& c) @@ -1110,7 +1111,9 @@ namespace relational optimistic_version_init (semantics::data_member& m) { sql_type t (parse_sql_type (column_type (m), m)); - return t.type != sql_type::ROWVERSION ? "1" : "st.version ()"; + return t.type != sql_type::ROWVERSION + ? "1" + : "version (sts.id_image ())"; } virtual string @@ -1119,8 +1122,54 @@ namespace relational sql_type t (parse_sql_type (column_type (m), m)); return t.type != sql_type::ROWVERSION ? "1" - : "sts.update_statement ().version ()"; + : "version (sts.id_image ())"; + } + + virtual bool + optimistic_insert_bind_version (semantics::data_member& m) + { + sql_type t (parse_sql_type (column_type (m), m)); + return t.type == sql_type::ROWVERSION; } + + virtual void + object_extra (type& c) + { + bool abst (abstract (c)); + + type* poly_root (polymorphic (c)); + bool poly (poly_root != 0); + bool poly_derived (poly && poly_root != &c); + + if (poly_derived || (abst && !poly)) + return; + + if (semantics::data_member* m = optimistic (c)) + { + sql_type t (parse_sql_type (column_type (*m), *m)); + if (t.type == sql_type::ROWVERSION) + { + string const& type (class_fq_name (c)); + string traits ("access::object_traits_impl< " + type + ", id_" + + db.string () + " >"); + + os << traits << "::version_type" << endl + << traits << "::" << endl + << "version (const id_image_type& i)" + << "{" + << "version_type v;"; + init_version_value_member_id_image_->traverse (*m); + os << "return v;" + << "}"; + } + } + } + + private: + // Go via the dynamic creation to get access to the constructor. + // + instance<relational::init_value_member> + init_version_value_member_id_image_; }; entry<class_> class_entry_; } |