diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-28 11:39:17 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-28 14:15:45 +0200 |
commit | 83550874e5e879f5e213522dbbe645e9137be8b9 (patch) | |
tree | 6257f52ba77df0a6c69bc8fa14e72728f6f86dea /common | |
parent | 0e4095ffecdc1f65a48d21730b0c8a0d96bc0c93 (diff) |
Add wrapper support for containers
Diffstat (limited to 'common')
-rw-r--r-- | common/wrapper/driver.cxx | 38 | ||||
-rw-r--r-- | common/wrapper/test.hxx | 31 |
2 files changed, 62 insertions, 7 deletions
diff --git a/common/wrapper/driver.cxx b/common/wrapper/driver.cxx index 32ac412..af6a3d1 100644 --- a/common/wrapper/driver.cxx +++ b/common/wrapper/driver.cxx @@ -31,9 +31,6 @@ main (int argc, char* argv[]) // // Simple values. // - - // - // unsigned long id; { object o; @@ -50,8 +47,6 @@ main (int argc, char* argv[]) t.commit (); } - // - // { transaction t (db->begin ()); auto_ptr<object> o (db->load<object> (id)); @@ -101,6 +96,39 @@ main (int argc, char* argv[]) assert (*o->c2 == *co.c2); } } + + // + // Containers. + // + { + cont_object co; + + co.vi.reset (new vector<int>); + co.vi->push_back (1); + co.vi->push_back (2); + co.vi->push_back (3); + + co.c.num = 123; + co.c.strs.reset (new vector<string>); + co.c.strs->push_back ("1"); + co.c.strs->push_back ("2"); + co.c.strs->push_back ("3"); + + { + transaction t (db->begin ()); + id = db->persist (co); + t.commit (); + } + + { + transaction t (db->begin ()); + auto_ptr<cont_object> o (db->load<cont_object> (id)); + t.commit (); + + assert (*o->vi == *co.vi); + assert (o->c == co.c); + } + } } catch (const odb::exception& e) { diff --git a/common/wrapper/test.hxx b/common/wrapper/test.hxx index b28d7a0..6a1e0a9 100644 --- a/common/wrapper/test.hxx +++ b/common/wrapper/test.hxx @@ -69,7 +69,7 @@ struct comp1 }; inline bool -operator== (const comp1& x, const comp1 y) +operator== (const comp1& x, const comp1& y) { return x.str == y.str && x.num == y.num; } @@ -88,7 +88,7 @@ struct comp2 }; inline bool -operator== (const comp2& x, const comp2 y) +operator== (const comp2& x, const comp2& y) { return x.str == y.str && x.num == y.num && x.strs == y.strs; } @@ -122,4 +122,31 @@ struct comp_object2 std::auto_ptr<comp3> c3; }; +// +// Containers. +// + +#pragma db value +struct cont_comp +{ + int num; + std::auto_ptr<std::vector<std::string> > strs; +}; + +inline bool +operator== (const cont_comp& x, const cont_comp& y) +{ + return x.num == y.num && *x.strs == *y.strs; +} + +#pragma db object +struct cont_object +{ + #pragma db id auto + unsigned long id_; + + std::auto_ptr<std::vector<int> > vi; // Wrapped container. + cont_comp c; // Wrapped container in comp value. +}; + #endif // TEST_HXX |