diff options
Diffstat (limited to 'odb-tests/evolution/soft-add')
| -rw-r--r-- | odb-tests/evolution/soft-add/buildfile | 64 | ||||
| -rw-r--r-- | odb-tests/evolution/soft-add/driver.cxx | 195 | ||||
| -rw-r--r-- | odb-tests/evolution/soft-add/testscript | 54 |
3 files changed, 218 insertions, 95 deletions
diff --git a/odb-tests/evolution/soft-add/buildfile b/odb-tests/evolution/soft-add/buildfile new file mode 100644 index 0000000..6a61697 --- /dev/null +++ b/odb-tests/evolution/soft-add/buildfile @@ -0,0 +1,64 @@ +# file : evolution/soft-add/buildfile +# license : GNU GPL v2; see accompanying LICENSE file + +if ($build.meta_operation != 'dist') + assert (!$multi) "multi-database mode is not supported by this test" + +db = ($databases[0]) + +import libodb = libodb%lib{odb} + +import libs = libodb-$db%lib{odb-$db} +import libs += lib{common} + +hdrs = test1 test2 test3 + +exe{driver}: {hxx cxx}{* -*-odb} testscript + +# Introduce the metadata library target to make sure the libodb library is +# resolved for the odb_compile ad hoc rule (see build/root.build for details). +# +libue{test-meta}: $libodb + +for h: $hdrs + exe{driver}: {hxx ixx cxx}{$h-odb}: hxx{$h} libue{test-meta} hxx{model} + +# Make sure testN.hxx are compiled serially since they share the changelog. +# +# @@ TODO: make order-only when supported by build2. +# +{hxx ixx cxx}{test3-odb}: {hxx ixx cxx}{test2-odb}: {hxx ixx cxx}{test1-odb} + +exe{driver}: libue{test-meta} $libs + +# Specify the ODB custom options to be used by the odb_compile ad hoc rule +# (see build/root.build for details). +# +odb_options = --table-prefix evo_soft_a_ \ + --schema-version-table evo_soft_a_sv \ + --generate-schema \ + --generate-query \ + --generate-prepared \ + --at-once \ + --changelog $out_base/model.xml + +<{hxx ixx cxx}{test1-odb}>: odb_options += --init-changelog +<{hxx ixx cxx}{test2-odb}>: odb_options += --omit-create --suppress-migration + +<{hxx ixx cxx}{test3-odb}>: +{ + odb_options += --omit-create + schema_versions = 002 003 +} + +cxx.poptions =+ "-I$out_base" "-I$src_base" + +# Testscript's run-time prerequisites. +# +exe{driver}: ../../alias{database-client}: include = adhoc + +testscript@./: +{ + db = $db + schemas = $hdrs +} diff --git a/odb-tests/evolution/soft-add/driver.cxx b/odb-tests/evolution/soft-add/driver.cxx index c70edcb..a18c6a2 100644 --- a/odb-tests/evolution/soft-add/driver.cxx +++ b/odb-tests/evolution/soft-add/driver.cxx @@ -4,22 +4,24 @@ // Test soft-add functionality. // -#include <memory> // std::auto_ptr -#include <cassert> +#include <memory> // std::unique_ptr #include <iostream> #include <odb/database.hxx> #include <odb/transaction.hxx> #include <odb/schema-catalog.hxx> -#include <common/config.hxx> // DATABASE_XXX -#include <common/common.hxx> +#include <libcommon/config.hxx> // DATABASE_XXX +#include <libcommon/common.hxx> #include "test2.hxx" #include "test3.hxx" #include "test2-odb.hxx" #include "test3-odb.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace odb::core; @@ -28,7 +30,10 @@ main (int argc, char* argv[]) { try { - auto_ptr<database> db (create_database (argc, argv, false)); + unique_ptr<database> db (create_database (argc, argv, false)); + + db->schema_version_table ("evo_soft_a_sv"); + bool embedded (schema_catalog::exists (*db)); // 1 - base version @@ -85,7 +90,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "" && p->num == 123 && p->vec.empty () && p->ptr == 0); t.commit (); @@ -123,7 +128,7 @@ main (int argc, char* argv[]) transaction t (db->begin ()); db->persist (o); db->persist (*o.ptr); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "" && p->num == 234 && p->vec.empty () && p->ptr == 0); t.commit (); @@ -139,7 +144,7 @@ main (int argc, char* argv[]) transaction t (db->begin ()); db->erase<object1> (2); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "" && p->num == 235 && p->vec.empty () && p->ptr == 0); t.commit (); @@ -166,7 +171,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == ""); t.commit (); } @@ -176,7 +181,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == ""); t.commit (); } @@ -202,7 +207,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); assert (static_cast<object&> (*p).str == ""); db->erase (o); t.commit (); @@ -228,7 +233,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->vec[0].str == "" && p->vec[0].num == 123); t.commit (); } @@ -239,7 +244,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->vec[0].str == "" && p->vec[0].num == 234); t.commit (); } @@ -250,7 +255,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->vec[0].str == "" && p->vec[0].num == 235); t.commit (); } @@ -321,7 +326,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); try { @@ -383,7 +388,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->str == "" && p->num == 123 && p->vec.empty ()); t.commit (); @@ -418,7 +423,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "" && p->num == 234 && p->vec.empty ()); t.commit (); @@ -431,7 +436,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "" && p->num == 234 && p->vec.empty ()); t.commit (); @@ -442,7 +447,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "" && p->num == 235 && p->vec.empty ()); t.commit (); @@ -476,7 +481,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (static_cast<object*> (db->load<base> (1))); + unique_ptr<object> p (static_cast<object*> (db->load<base> (1))); assert (p->bstr == "" && p->dstr == "" && p->num == 123); t.commit (); } @@ -530,7 +535,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->bstr == "" && p->dstr == "" && p->num == 234); t.commit (); } @@ -542,7 +547,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->bstr == "" && p->dstr == "" && p->num == 235); t.commit (); } @@ -575,7 +580,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); try { @@ -637,7 +642,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); db->load (*p, p->s); object& o (static_cast<object&> (*p)); assert (o.bstr == "" && o.dstr == "" && o.num == 123); @@ -695,7 +700,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "" && p->dstr == "" && p->num == 234); t.commit (); @@ -709,7 +714,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "" && p->dstr == "" && p->num == 235); t.commit (); @@ -729,7 +734,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (b); - auto_ptr<base> p (db->load<base> (3)); + unique_ptr<base> p (db->load<base> (3)); db->load (*p, p->s); assert (p->bstr == ""); t.commit (); @@ -741,7 +746,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (b); - auto_ptr<base> p (db->load<base> (3)); + unique_ptr<base> p (db->load<base> (3)); db->load (*p, p->s); assert (p->bstr == ""); t.commit (); @@ -774,7 +779,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "" && p->num == 123); t.commit (); } @@ -805,7 +810,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "" && p->num == 234); t.commit (); } @@ -818,7 +823,7 @@ main (int argc, char* argv[]) unsigned long long v (o.v_); db->update (o); assert (o.v_ != v); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "" && p->num == 235 && p->v_ == o.v_); t.commit (); } @@ -910,7 +915,7 @@ main (int argc, char* argv[]) } { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (id)); + unique_ptr<object> p (db->load<object> (id)); assert (p->str == "" && p->num == 123); t.commit (); } @@ -941,7 +946,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == "" && p->num == 234); t.commit (); } @@ -952,7 +957,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == "" && p->num == 235); t.commit (); } @@ -984,7 +989,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->num == 123 && p->vec.empty ()); t.commit (); } @@ -1007,7 +1012,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->num == 234 && p->vec.empty ()); t.commit (); } @@ -1018,7 +1023,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->num == 235 && p->vec.empty ()); t.commit (); } @@ -1050,7 +1055,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->num == 123 && p->vec.empty ()); t.commit (); @@ -1076,7 +1081,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->num == 234 && p->vec.empty ()); t.commit (); @@ -1088,7 +1093,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->num == 234 && p->vec.empty ()); t.commit (); @@ -1099,7 +1104,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->num == 235 && p->vec.empty ()); t.commit (); @@ -1135,7 +1140,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->str = "abc"; p->vec.push_back (123); delete p->ptr; @@ -1146,7 +1151,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123 && p->ptr->id_ == 1); t.commit (); @@ -1177,7 +1182,7 @@ main (int argc, char* argv[]) transaction t (db->begin ()); db->persist (o); db->persist (*o.ptr); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "bcd" && p->num == 234 && p->vec[0] == 234 && p->ptr->id_ == 2); t.commit (); @@ -1193,7 +1198,7 @@ main (int argc, char* argv[]) transaction t (db->begin ()); db->erase<object1> (2); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "bcde" && p->num == 235 && p->vec[0] == 235 && p->ptr == 0); t.commit (); @@ -1216,7 +1221,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->vec.modify (0).str = "abc"; db->update (*p); t.commit (); @@ -1224,7 +1229,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->vec[0].str == "abc" && p->vec[0].num == 123); t.commit (); } @@ -1235,7 +1240,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->vec[0].str == "bcd" && p->vec[0].num == 234); t.commit (); } @@ -1246,7 +1251,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->vec[0].str == "bcde" && p->vec[0].num == 235); t.commit (); } @@ -1268,7 +1273,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->str = "abc"; db->update (*p); t.commit (); @@ -1296,7 +1301,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); p->str = "abc"; p->vec.push_back (123); @@ -1306,7 +1311,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123); t.commit (); @@ -1333,7 +1338,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "bcd" && p->num == 234 && p->vec[0] == 234); t.commit (); @@ -1346,7 +1351,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "bcde" && p->num == 235 && p->vec[0] == 235); t.commit (); @@ -1369,7 +1374,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); p->str = "abc"; p->vec.push_back (123); @@ -1379,7 +1384,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123); t.commit (); @@ -1406,7 +1411,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "bcd" && p->num == 234 && p->vec[0] == 234); t.commit (); @@ -1419,7 +1424,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->str == "bcde" && p->num == 235 && p->vec[0] == 235); t.commit (); @@ -1442,7 +1447,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->bstr = "ab"; p->dstr = "abc"; db->update (*p); @@ -1451,7 +1456,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (static_cast<object*> (db->load<base> (1))); + unique_ptr<object> p (static_cast<object*> (db->load<base> (1))); assert (p->bstr == "ab" && p->dstr == "abc" && p->num == 123); t.commit (); } @@ -1477,7 +1482,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->bstr == "bc" && p->dstr == "bcd" && p->num == 234); t.commit (); } @@ -1489,7 +1494,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->bstr == "bcd" && p->dstr == "bcde" && p->num == 235); t.commit (); } @@ -1511,7 +1516,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); p->bstr = "ab"; p->dstr = "abc"; @@ -1521,7 +1526,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); db->load (*p, p->s); object& o (static_cast<object&> (*p)); assert (o.bstr == "ab" && o.dstr == "abc" && o.num == 123); @@ -1550,7 +1555,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "bc" && p->dstr == "bcd" && p->num == 234); t.commit (); @@ -1564,7 +1569,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "bcd" && p->dstr == "bcde" && p->num == 235); t.commit (); @@ -1587,7 +1592,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); p->bstr = "ab"; p->dstr = "abc"; @@ -1597,7 +1602,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); db->load (*p, p->s); object& o (static_cast<object&> (*p)); assert (o.bstr == "ab" && o.dstr == "abc" && o.num == 123); @@ -1626,7 +1631,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "bc" && p->dstr == "bcd" && p->num == 234); t.commit (); @@ -1640,7 +1645,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (static_cast<base&> (o)); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->bstr == "bcd" && p->dstr == "bcde" && p->num == 235); t.commit (); @@ -1663,7 +1668,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->str = "abc"; db->update (*p); t.commit (); @@ -1671,7 +1676,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "abc" && p->num == 123); t.commit (); } @@ -1694,7 +1699,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "bcd" && p->num == 234); t.commit (); } @@ -1707,7 +1712,7 @@ main (int argc, char* argv[]) unsigned long long v (o.v_); db->update (o); assert (o.v_ != v); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->str == "bcde" && p->num == 235 && p->v_ == o.v_); t.commit (); } @@ -1785,7 +1790,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (id)); + unique_ptr<object> p (db->load<object> (id)); assert (p->str == "abc" && p->num == 123); t.commit (); } @@ -1805,7 +1810,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == "bcd" && p->num == 234); t.commit (); } @@ -1816,7 +1821,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (o.id)); + unique_ptr<object> p (db->load<object> (o.id)); assert (p->str == "bcde" && p->num == 235); t.commit (); } @@ -1838,7 +1843,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); p->vec.push_back (123); db->update (*p); t.commit (); @@ -1846,7 +1851,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->num == 123 && p->vec[0] == 123); t.commit (); } @@ -1869,7 +1874,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->num == 234 && p->vec[0] == 234); t.commit (); } @@ -1880,7 +1885,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); assert (p->num == 235 && p->vec[0] == 235); t.commit (); } @@ -1902,7 +1907,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); p->vec.push_back (123); db->update (*p, p->s); @@ -1911,7 +1916,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->num == 123 && p->vec[0] == 123); t.commit (); @@ -1937,7 +1942,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->persist (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->num == 234 && p->vec[0] == 234); t.commit (); @@ -1949,7 +1954,7 @@ main (int argc, char* argv[]) { transaction t (db->begin ()); db->update (o); - auto_ptr<object> p (db->load<object> (2)); + unique_ptr<object> p (db->load<object> (2)); db->load (*p, p->s); assert (p->num == 235 && p->vec[0] == 235); t.commit (); @@ -1984,7 +1989,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123 && p->ptr->id_ == 1); t.commit (); @@ -2001,7 +2006,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->vec[0].str == "abc" && p->vec[0].num == 123); t.commit (); } @@ -2037,7 +2042,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123); t.commit (); @@ -2054,7 +2059,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->str == "abc" && p->num == 123 && p->vec[0] == 123); t.commit (); @@ -2071,7 +2076,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (static_cast<object*> (db->load<base> (1))); + unique_ptr<object> p (static_cast<object*> (db->load<base> (1))); assert (p->bstr == "ab" && p->dstr == "abc" && p->num == 123); t.commit (); } @@ -2087,7 +2092,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); db->load (*p, p->s); object& o (static_cast<object&> (*p)); assert (o.bstr == "ab" && o.dstr == "abc" && o.num == 123); @@ -2105,7 +2110,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<base> p (db->load<base> (1)); + unique_ptr<base> p (db->load<base> (1)); db->load (*p, p->s); object& o (static_cast<object&> (*p)); assert (o.bstr == "ab" && o.dstr == "abc" && o.num == 123); @@ -2123,7 +2128,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->str == "abc" && p->num == 123); t.commit (); } @@ -2179,7 +2184,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); assert (p->num == 123 && p->vec[0] == 123); t.commit (); } @@ -2195,7 +2200,7 @@ main (int argc, char* argv[]) // { transaction t (db->begin ()); - auto_ptr<object> p (db->load<object> (1)); + unique_ptr<object> p (db->load<object> (1)); db->load (*p, p->s); assert (p->num == 123 && p->vec[0] == 123); t.commit (); diff --git a/odb-tests/evolution/soft-add/testscript b/odb-tests/evolution/soft-add/testscript new file mode 100644 index 0000000..9563f33 --- /dev/null +++ b/odb-tests/evolution/soft-add/testscript @@ -0,0 +1,54 @@ +# file : evolution/soft-add/testscript +# license : GNU GPL v2; see accompanying LICENSE file + +.include ../../database-options.testscript +.include ../../$db-schema.testscript + +test.arguments += $($(db)_options) + +: basics +: +if! $sqlite +{ + ss =; # Schema modification base file names. + + # Drop everything. + # + for s: $schemas + ss =+ $s + end; + + # Add base schema. + # + ss += test3-002-pre test3-002-post; + + # Add migration. + # + ss += test3-003-pre test3-003-post; + + # Run tests. + # + for s: $ss + f = $out_base/"$s".sql + + if $mysql + cat $f | $create_schema_cmd + elif $pgsql + $create_schema_cmd -f $f + end + + if ($s == 'test3-002-post') + $* 1 + elif ($s == 'test3-003-pre') + $* 2 + elif ($s == 'test3-003-post') + $* 3 + end + end +} +else +{ + $* 1 &odb-test.db; + $* 2; + $* 3 +} |