aboutsummaryrefslogtreecommitdiff
path: root/evolution/soft-add
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-09-10 14:03:21 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-09-17 12:04:03 +0200
commit86a83893351adef44574514c303aa880cf3b6d54 (patch)
tree706ba87b0bd2a8ffbdd3e1e55f6850a2119039cb /evolution/soft-add
parent22415f5ec7d53fbad4818ac31a42d6e623b8afa9 (diff)
Add soft-add/delete auto id test, LOB/long data test
Diffstat (limited to 'evolution/soft-add')
-rw-r--r--evolution/soft-add/driver.cxx168
-rw-r--r--evolution/soft-add/model.hxx31
2 files changed, 195 insertions, 4 deletions
diff --git a/evolution/soft-add/driver.cxx b/evolution/soft-add/driver.cxx
index 4703a8a..190cc0c 100644
--- a/evolution/soft-add/driver.cxx
+++ b/evolution/soft-add/driver.cxx
@@ -96,7 +96,7 @@ main (int argc, char* argv[])
try
{
- db->query<object> (query::str == "abc"); // No such column.
+ db->query<object> (query::str.is_null ()); // No such column.
assert (false);
}
catch (const odb::exception&) {}
@@ -881,6 +881,81 @@ main (int argc, char* argv[])
}
}
+ // Test soft-added member in an object with auto id.
+ //
+ {
+ using namespace test14;
+
+ // None of the database operations should yet include the
+ // added members.
+ //
+ unsigned long id;
+ {
+ object o;
+ o.str = "abc";
+ o.num = 123;
+
+ transaction t (db->begin ());
+ db->persist (o);
+ id = o.id;
+ t.commit ();
+ }
+ {
+ transaction t (db->begin ());
+ auto_ptr<object> p (db->load<object> (id));
+ assert (p->str == "" && p->num == 123);
+ t.commit ();
+ }
+
+ {
+ typedef odb::query<object> query;
+ typedef odb::result<object> result;
+
+ transaction t (db->begin ());
+ result r (db->query<object> (query::num == 123));
+ result::iterator i (r.begin ());
+ assert (i != r.end () && i->str == "" && i->num == 123);
+
+ try
+ {
+ db->query<object> (query::str == "abc"); // No such column.
+ assert (false);
+ }
+ catch (const odb::exception&) {}
+
+ t.commit ();
+ }
+
+ object o;
+ o.str = "bcd";
+ o.num = 234;
+
+ {
+ transaction t (db->begin ());
+ db->persist (o);
+ auto_ptr<object> p (db->load<object> (o.id));
+ assert (p->str == "" && p->num == 234);
+ t.commit ();
+ }
+
+ o.str += 'e';
+ o.num++;
+
+ {
+ transaction t (db->begin ());
+ db->update (o);
+ auto_ptr<object> p (db->load<object> (o.id));
+ assert (p->str == "" && p->num == 235);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ db->erase<object> (o.id);
+ t.commit ();
+ }
+ }
+
// Test soft-added container member in a non-versioned object.
//
{
@@ -1055,6 +1130,7 @@ main (int argc, char* argv[])
auto_ptr<object> p (db->load<object> (1));
p->str = "abc";
p->vec.push_back (123);
+ delete p->ptr;
p->ptr = new object1 (1);
db->update (*p);
t.commit ();
@@ -1073,7 +1149,7 @@ main (int argc, char* argv[])
typedef odb::result<object> result;
transaction t (db->begin ());
- result r (db->query<object> (query::str == "abc" &&
+ result r (db->query<object> (query::str.is_not_null () &&
query::ptr->id == 1));
result::iterator i (r.begin ());
assert (i != r.end () &&
@@ -1676,6 +1752,74 @@ main (int argc, char* argv[])
}
}
+ // Test soft-added member in an object with auto id.
+ //
+ {
+ using namespace test14;
+
+ typedef odb::query<object> query;
+ typedef odb::result<object> result;
+
+ // All the database operations should now include the added
+ // members.
+ //
+ unsigned long id;
+ {
+ transaction t (db->begin ());
+ result r (db->query<object> (query::num == 123));
+ result::iterator i (r.begin ());
+ assert (i != r.end ());
+ i->str = "abc";
+ db->update (*i);
+ id = i->id;
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ auto_ptr<object> p (db->load<object> (id));
+ assert (p->str == "abc" && p->num == 123);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ result r (db->query<object> (query::str == "abc"));
+ result::iterator i (r.begin ());
+ assert (i != r.end () && i->str == "abc" && i->num == 123);
+ t.commit ();
+ }
+
+ object o;
+ o.str = "bcd";
+ o.num = 234;
+
+ {
+ transaction t (db->begin ());
+ db->persist (o);
+ auto_ptr<object> p (db->load<object> (o.id));
+ assert (p->str == "bcd" && p->num == 234);
+ t.commit ();
+ }
+
+ o.str += 'e';
+ o.num++;
+
+ {
+ transaction t (db->begin ());
+ db->update (o);
+ auto_ptr<object> p (db->load<object> (o.id));
+ assert (p->str == "bcde" && p->num == 235);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ db->erase (o);
+ t.commit ();
+ }
+ }
+
// Test soft-added container member in a non-versioned object.
//
{
@@ -1997,6 +2141,26 @@ main (int argc, char* argv[])
}
}
+ // Test soft-added member in an object with auto id.
+ //
+ {
+ using namespace test14;
+
+ // All the database operations should still include the added
+ // members.
+ //
+ {
+ typedef odb::query<object> query;
+ typedef odb::result<object> result;
+
+ transaction t (db->begin ());
+ result r (db->query<object> (query::str == "abc"));
+ result::iterator i (r.begin ());
+ assert (i != r.end () && i->str == "abc" && i->num == 123);
+ t.commit ();
+ }
+ }
+
// Test soft-added container member in a non-versioned object.
//
{
diff --git a/evolution/soft-add/model.hxx b/evolution/soft-add/model.hxx
index 1a7520a..50a7639 100644
--- a/evolution/soft-add/model.hxx
+++ b/evolution/soft-add/model.hxx
@@ -59,7 +59,11 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
};
#if MODEL_VERSION == 3
- #pragma db member(object::str) added(3)
+ // Make it a LOB for Oracle and long data for SQL Server.
+ //
+ #pragma db member(object::str) added(3) \
+ oracle:type("CLOB") \
+ mssql:type("VARCHAR(max)")
#pragma db member(object::vec) added(3)
#pragma db member(object::ptr) added(3)
#else
@@ -414,7 +418,30 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
};
#if MODEL_VERSION == 3
- #pragma db member(object::str) added(3) default("abc")
+ #pragma db member(object::str) added(3) default("abc") \
+ mysql:type("VARCHAR(255)")
+#else
+ #pragma db member(object::str) transient
+#endif
+ }
+
+ // Test soft-added member in an object with auto id.
+ //
+ #pragma db namespace table("t14_")
+ namespace test14
+ {
+ #pragma db object
+ struct object
+ {
+ std::string str;
+ unsigned long num;
+
+ #pragma db id auto
+ unsigned long id;
+ };
+
+#if MODEL_VERSION == 3
+ #pragma db member(object::str) added(3)
#else
#pragma db member(object::str) transient
#endif