summaryrefslogtreecommitdiff
path: root/odb-tests/common/relationship
diff options
context:
space:
mode:
Diffstat (limited to 'odb-tests/common/relationship')
-rw-r--r--odb-tests/common/relationship/basics/buildfile41
-rw-r--r--odb-tests/common/relationship/basics/driver.cxx150
-rw-r--r--odb-tests/common/relationship/basics/test.hxx260
-rw-r--r--odb-tests/common/relationship/basics/testscript33
-rw-r--r--odb-tests/common/relationship/on-delete/buildfile43
-rw-r--r--odb-tests/common/relationship/on-delete/driver.cxx82
-rw-r--r--odb-tests/common/relationship/on-delete/test.hxx58
-rw-r--r--odb-tests/common/relationship/on-delete/testscript33
-rw-r--r--odb-tests/common/relationship/query/buildfile42
-rw-r--r--odb-tests/common/relationship/query/driver.cxx168
-rw-r--r--odb-tests/common/relationship/query/test.hxx140
-rw-r--r--odb-tests/common/relationship/query/testscript33
12 files changed, 1083 insertions, 0 deletions
diff --git a/odb-tests/common/relationship/basics/buildfile b/odb-tests/common/relationship/basics/buildfile
new file mode 100644
index 0000000..d7bbb7e
--- /dev/null
+++ b/odb-tests/common/relationship/basics/buildfile
@@ -0,0 +1,41 @@
+# file : common/relationship/basics/buildfile
+# license : GNU GPL v2; see accompanying LICENSE file
+
+import libodb = libodb%lib{odb}
+
+libs =
+
+for db: $databases
+ import libs += libodb-$db%lib{odb-$db}
+
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-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
+
+<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta}
+
+for db: $databases
+{
+ exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi
+ <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta}
+}
+
+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 t_rel_basics_ \
+ --generate-schema \
+ --generate-query
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/odb-tests/common/relationship/basics/driver.cxx b/odb-tests/common/relationship/basics/driver.cxx
new file mode 100644
index 0000000..e27c127
--- /dev/null
+++ b/odb-tests/common/relationship/basics/driver.cxx
@@ -0,0 +1,150 @@
+// file : common/relationship/basics/driver.cxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Test object relationships.
+//
+
+#include <memory> // std::unique_ptr
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <libcommon/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+#undef NDEBUG
+#include <cassert>
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+ try
+ {
+ unique_ptr<database> db (create_database (argc, argv));
+
+ aggr a ("aggr");
+ a.o1 = new obj1 ("o1", "obj1");
+ a.o2.reset (new obj2 ("obj2"));
+
+ a.v2.push_back (obj2_ptr (new obj2 ("v1 obj2 1")));
+ a.v2.push_back (0);
+ a.v2.push_back (obj2_ptr (new obj2 ("v1 obj2 2")));
+
+ a.o3.reset (new obj3 ("obj3"));
+
+ a.c.num = 123;
+ a.c.o3.reset (new obj3 ("c"));
+
+ a.cv.push_back (comp (234, obj3_ptr (new obj3 ("cv 0"))));
+ a.cv.push_back (comp (235, obj3_ptr ()));
+ a.cv.push_back (comp (236, obj3_ptr (new obj3 ("cv 2"))));
+
+ a.v1.push_back (new obj1 ("v1 0", "v1 0"));
+ a.v1.push_back (0);
+ a.v1.push_back (new obj1 ("v1 2", "v1 2"));
+
+ // Set cannot contain NULL pointers.
+ //
+ a.s1.insert (new obj1 ("s1 0", "s1 0"));
+ a.s1.insert (new obj1 ("s1 2", "s1 2"));
+
+ a.m1[0] = new obj1 ("m1 0", "m1 0");
+ a.m1[1] = 0;
+ a.m1[2] = new obj1 ("m1 2", "m1 2");
+
+ // persist
+ //
+ {
+ transaction t (db->begin ());
+ db->persist (a.o1);
+ db->persist (a.o2);
+
+ for (obj2_vec::iterator i (a.v2.begin ()); i != a.v2.end (); ++i)
+ if (*i)
+ db->persist (*i);
+
+ db->persist (a.o3);
+
+ db->persist (a.c.o3);
+
+ for (comp_vec::iterator i (a.cv.begin ()); i != a.cv.end (); ++i)
+ if (i->o3)
+ db->persist (i->o3);
+
+ for (obj1_vec::iterator i (a.v1.begin ()); i != a.v1.end (); ++i)
+ if (*i)
+ db->persist (*i);
+
+ for (obj1_set::iterator i (a.s1.begin ()); i != a.s1.end (); ++i)
+ if (*i)
+ db->persist (*i);
+
+ for (obj1_map::iterator i (a.m1.begin ()); i != a.m1.end (); ++i)
+ if (i->second)
+ db->persist (i->second);
+
+ db->persist (a);
+ t.commit ();
+ }
+
+ // load & compare
+ //
+ {
+ transaction t (db->begin ());
+ unique_ptr<aggr> a1 (db->load<aggr> (a.id));
+ t.commit ();
+
+ assert (*a1 == a);
+ }
+
+ // query
+ //
+ typedef odb::query<aggr> query;
+ typedef odb::result<aggr> result;
+
+ {
+ transaction t (db->begin ());
+
+ result r (db->query<aggr> (query::o1->str == "obj1"));
+ assert (!r.empty ());
+ assert (r.begin ()->o1->id == a.o1->id);
+ assert (size (r) == 1);
+
+ t.commit ();
+ }
+
+ // Test NULL pointer.
+ //
+ delete a.o1;
+ a.o1 = 0;
+ a.o2.reset ();
+ a.o3.reset ();
+
+ {
+ transaction t (db->begin ());
+ db->update (a);
+ t.commit ();
+ }
+
+ // load & compare
+ //
+ {
+ transaction t (db->begin ());
+ unique_ptr<aggr> a1 (db->load<aggr> (a.id));
+ t.commit ();
+
+ assert (*a1 == a);
+ }
+ }
+ catch (const odb::exception& e)
+ {
+ cerr << e.what () << endl;
+ return 1;
+ }
+}
diff --git a/odb-tests/common/relationship/basics/test.hxx b/odb-tests/common/relationship/basics/test.hxx
new file mode 100644
index 0000000..8a2742e
--- /dev/null
+++ b/odb-tests/common/relationship/basics/test.hxx
@@ -0,0 +1,260 @@
+// file : common/relationship/basics/test.hxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <set>
+#include <map>
+#include <vector>
+#include <string>
+#include <memory>
+
+#include <odb/core.hxx>
+
+// Raw pointer.
+//
+#pragma db object pointer(obj1*)
+struct obj1
+{
+ obj1 () {}
+ obj1 (const std::string& i, const std::string& s): id (i), str (s) {}
+
+ #pragma db id
+ std::string id;
+ std::string str;
+};
+
+inline bool
+operator== (const obj1& x, const obj1& y)
+{
+ return x.id == y.id && x.str == y.str;
+}
+
+// vector
+//
+typedef std::vector<obj1*> obj1_vec;
+
+inline bool
+operator== (const obj1_vec& x, const obj1_vec& y)
+{
+ if (x.size () != y.size ())
+ return false;
+
+ for (obj1_vec::size_type i (0); i < x.size (); ++i)
+ if (!(x[i] ? (y[i] && *x[i] == *y[i]) : !y[i]))
+ return false;
+
+ return true;
+}
+
+// set
+//
+struct obj1_cmp
+{
+ bool
+ operator() (obj1* x, obj1* y) const
+ {
+ return (!x || !y) ? x < y : x->id < y->id;
+ }
+};
+
+typedef std::set<obj1*, obj1_cmp> obj1_set;
+
+inline bool
+operator== (const obj1_set& x, const obj1_set& y)
+{
+ if (x.size () != y.size ())
+ return false;
+
+ for (obj1_set::const_iterator i (x.begin ()); i != x.end (); ++i)
+ {
+ obj1_set::const_iterator j (y.find (*i));
+
+ if (j == y.end ())
+ return false;
+
+ obj1* x (*i);
+ obj1* y (*j);
+
+ if (!(x ? (y && *x == *y) : !y))
+ return false;
+ }
+
+ return true;
+}
+
+// map
+//
+typedef std::map<int, obj1*> obj1_map;
+
+inline bool
+operator== (const obj1_map& x, const obj1_map& y)
+{
+ if (x.size () != y.size ())
+ return false;
+
+ for (obj1_map::const_iterator i (x.begin ()); i != x.end (); ++i)
+ {
+ obj1_map::const_iterator j (y.find (i->first));
+
+ if (j == y.end ())
+ return false;
+
+ obj1* x (i->second);
+ obj1* y (j->second);
+
+ if (!(x ? (y && *x == *y) : !y))
+ return false;
+ }
+
+ return true;
+}
+
+// auto_ptr/unique_ptr
+//
+struct obj2;
+
+typedef std::unique_ptr<obj2> obj2_ptr;
+
+#pragma db object pointer(obj2_ptr)
+struct obj2
+{
+ obj2 () {}
+ obj2 (const std::string& s): str (s) {}
+
+ #pragma db id auto
+ unsigned long id;
+
+ std::string str;
+};
+
+inline bool
+operator== (const obj2& x, const obj2& y)
+{
+ return x.id == y.id && x.str == y.str;
+}
+
+typedef std::vector<obj2_ptr> obj2_vec;
+
+inline bool
+operator== (const obj2_vec& x, const obj2_vec& y)
+{
+ if (x.size () != y.size ())
+ return false;
+
+ for (obj2_vec::size_type i (0); i < x.size (); ++i)
+ if (!(x[i] ? (y[i] && *x[i] == *y[i]) : !y[i]))
+ return false;
+
+ return true;
+}
+
+// shared_ptr
+//
+struct obj3;
+
+typedef std::shared_ptr<obj3> obj3_ptr;
+
+#pragma db object pointer(obj3_ptr)
+struct obj3
+{
+ obj3 () {}
+ obj3 (const std::string& s): str (s) {}
+
+ #pragma db id auto
+ unsigned long id;
+
+ std::string str;
+};
+
+inline bool
+operator== (const obj3& x, const obj3& y)
+{
+ return x.id == y.id && x.str == y.str;
+}
+
+// composite
+//
+#pragma db value
+struct comp
+{
+ comp () {}
+ comp (int n, obj3_ptr o): num (n), o3 (o) {}
+
+ int num;
+ obj3_ptr o3;
+};
+
+inline bool
+operator== (const comp& x, const comp& y)
+{
+ return x.num == y.num &&
+ (x.o3 ? (y.o3 && *x.o3 == *y.o3) : !y.o3);
+}
+
+typedef std::vector<comp> comp_vec;
+
+//
+//
+#pragma db object
+struct aggr
+{
+ aggr (): o1 (0) {}
+ aggr (const std::string& s): o1 (0), str (s) {}
+
+ ~aggr ()
+ {
+ delete o1;
+
+ for (obj1_vec::iterator i (v1.begin ()); i != v1.end (); ++i)
+ delete *i;
+
+ for (obj1_set::iterator i (s1.begin ()); i != s1.end (); ++i)
+ delete *i;
+
+ for (obj1_map::iterator i (m1.begin ()); i != m1.end (); ++i)
+ delete i->second;
+ }
+
+ #pragma db id auto
+ unsigned long id;
+
+ obj1* o1;
+
+ obj2_ptr o2; // std::auto_ptr or std::unique_ptr
+ obj2_vec v2;
+
+ obj3_ptr o3;
+ comp c;
+ comp_vec cv;
+
+ obj1_vec v1;
+ obj1_set s1;
+ obj1_map m1;
+
+ std::string str;
+
+private:
+ aggr (const aggr&);
+ aggr& operator= (const aggr&);
+};
+
+inline bool
+operator== (const aggr& x, const aggr& y)
+{
+ return
+ x.id == y.id &&
+ (x.o1 ? (y.o1 && *x.o1 == *y.o1) : !y.o1) &&
+ (x.o2.get () ? (y.o2.get () && *x.o2 == *y.o2) : !y.o2.get ()) &&
+ x.v2 == y.v2 &&
+ (x.o3.get () ? (y.o3.get () && *x.o3 == *y.o3) : !y.o3.get ()) &&
+ x.c == y.c &&
+ x.cv == y.cv &&
+ x.v1 == y.v1 &&
+ x.s1 == y.s1 &&
+ x.m1 == y.m1 &&
+ x.str == y.str;
+}
+
+#endif // TEST_HXX
diff --git a/odb-tests/common/relationship/basics/testscript b/odb-tests/common/relationship/basics/testscript
new file mode 100644
index 0000000..b498bfa
--- /dev/null
+++ b/odb-tests/common/relationship/basics/testscript
@@ -0,0 +1,33 @@
+# file : common/relationship/basics/testscript
+# license : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
+: mysql
+:
+if $mysql
+{
+ .include ../../../mysql.testscript
+
+ $create_schema;
+ $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+ .include ../../../sqlite.testscript
+
+ $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+ .include ../../../pgsql.testscript
+
+ $create_schema;
+ $*
+}
diff --git a/odb-tests/common/relationship/on-delete/buildfile b/odb-tests/common/relationship/on-delete/buildfile
new file mode 100644
index 0000000..965a2eb
--- /dev/null
+++ b/odb-tests/common/relationship/on-delete/buildfile
@@ -0,0 +1,43 @@
+# file : common/relationship/on-delete/buildfile
+# license : GNU GPL v2; see accompanying LICENSE file
+
+import libodb = libodb%lib{odb}
+
+libs =
+
+for db: $databases
+ import libs += libodb-$db%lib{odb-$db}
+
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-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
+
+<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta}
+
+for db: $databases
+{
+ exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi
+ <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta}
+}
+
+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 t_rel_on_d_ \
+ --generate-schema \
+ --fkeys-deferrable-mode mysql:not_deferrable \
+ --fkeys-deferrable-mode mssql:not_deferrable
+
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/odb-tests/common/relationship/on-delete/driver.cxx b/odb-tests/common/relationship/on-delete/driver.cxx
new file mode 100644
index 0000000..eec57cf
--- /dev/null
+++ b/odb-tests/common/relationship/on-delete/driver.cxx
@@ -0,0 +1,82 @@
+// file : common/relationship/on-delete/driver.cxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Test ON DELETE functionality.
+//
+
+#include <memory> // std::unique_ptr
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <libcommon/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+#undef NDEBUG
+#include <cassert>
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+ try
+ {
+ unique_ptr<database> db (create_database (argc, argv));
+
+ object o;
+
+ cascade c;
+ c.p = &o;
+
+ cascade_cont cc;
+ cc.p.push_back (&o);
+
+ set_null n;
+ n.p = &o;
+
+ set_null_cont nc;
+ nc.p.push_back (&o);
+
+ {
+ transaction t (db->begin ());
+ db->persist (o);
+ db->persist (c);
+ db->persist (cc);
+ db->persist (n);
+ db->persist (nc);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ db->erase (o);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ assert (db->find<cascade> (c.id) == 0);
+
+ unique_ptr<cascade_cont> pcc (db->load<cascade_cont> (cc.id));
+ assert (pcc->p.empty ());
+
+ unique_ptr<set_null> pn (db->load<set_null> (n.id));
+ assert (pn->p == 0);
+
+ unique_ptr<set_null_cont> pnc (db->load<set_null_cont> (nc.id));
+ assert (pnc->p.size () == 1 && pnc->p[0] == 0);
+
+ t.commit ();
+ }
+ }
+ catch (const odb::exception& e)
+ {
+ cerr << e.what () << endl;
+ return 1;
+ }
+}
diff --git a/odb-tests/common/relationship/on-delete/test.hxx b/odb-tests/common/relationship/on-delete/test.hxx
new file mode 100644
index 0000000..841acd9
--- /dev/null
+++ b/odb-tests/common/relationship/on-delete/test.hxx
@@ -0,0 +1,58 @@
+// file : common/relationship/on-delete/test.hxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <vector>
+
+#include <odb/core.hxx>
+
+#pragma db object
+struct object
+{
+ #pragma db id auto
+ unsigned long id;
+};
+
+#pragma db object
+struct cascade
+{
+ #pragma db id auto
+ unsigned long id;
+
+ #pragma db on_delete(cascade)
+ object* p;
+};
+
+#pragma db object
+struct cascade_cont
+{
+ #pragma db id auto
+ unsigned long id;
+
+ #pragma db on_delete(cascade)
+ std::vector<object*> p;
+};
+
+#pragma db object
+struct set_null
+{
+ #pragma db id auto
+ unsigned long id;
+
+ #pragma db on_delete(set_null)
+ object* p;
+};
+
+#pragma db object
+struct set_null_cont
+{
+ #pragma db id auto
+ unsigned long id;
+
+ #pragma db on_delete(set_null)
+ std::vector<object*> p;
+};
+
+#endif // TEST_HXX
diff --git a/odb-tests/common/relationship/on-delete/testscript b/odb-tests/common/relationship/on-delete/testscript
new file mode 100644
index 0000000..8288ebc
--- /dev/null
+++ b/odb-tests/common/relationship/on-delete/testscript
@@ -0,0 +1,33 @@
+# file : common/relationship/on-delete/testscript
+# license : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
+: mysql
+:
+if $mysql
+{
+ .include ../../../mysql.testscript
+
+ $create_schema;
+ $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+ .include ../../../sqlite.testscript
+
+ $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+ .include ../../../pgsql.testscript
+
+ $create_schema;
+ $*
+}
diff --git a/odb-tests/common/relationship/query/buildfile b/odb-tests/common/relationship/query/buildfile
new file mode 100644
index 0000000..b70edc4
--- /dev/null
+++ b/odb-tests/common/relationship/query/buildfile
@@ -0,0 +1,42 @@
+# file : common/relationship/query/buildfile
+# license : GNU GPL v2; see accompanying LICENSE file
+
+import libodb = libodb%lib{odb}
+
+libs =
+
+for db: $databases
+ import libs += libodb-$db%lib{odb-$db}
+
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-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
+
+<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta}
+
+for db: $databases
+{
+ exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi
+ <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta}
+}
+
+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 t_rel_query_ \
+ --generate-schema \
+ --generate-query \
+ --generate-session
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/odb-tests/common/relationship/query/driver.cxx b/odb-tests/common/relationship/query/driver.cxx
new file mode 100644
index 0000000..20d5370
--- /dev/null
+++ b/odb-tests/common/relationship/query/driver.cxx
@@ -0,0 +1,168 @@
+// file : common/relationship-query/query/driver.cxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Test relationship queries.
+//
+
+#include <memory> // std::unique_ptr
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/session.hxx>
+#include <odb/transaction.hxx>
+
+#include <libcommon/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+#undef NDEBUG
+#include <cassert>
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+ try
+ {
+ unique_ptr<database> db (create_database (argc, argv));
+
+ //
+ //
+ {
+ shared_ptr<country> ca (new country ("CA", "Canada"));
+ shared_ptr<country> za (new country ("ZA", "South Africa"));
+ shared_ptr<country> us (new country ("US", "United States"));
+ shared_ptr<country> se (new country ("SE", "Sweden"));
+
+ shared_ptr<employer> st (new employer ("Simple Tech, Inc", ca));
+ shared_ptr<employer> ct (new employer ("Complex Tech, Inc", us));
+
+ // person
+ //
+ shared_ptr<person> p1 (
+ new person (1, "John", "Doe", 30, ca, true, za));
+
+ shared_ptr<person> p2 (
+ new person (2, "Jane", "Doe", 29, za, false, us));
+ p2->husband = p1;
+
+ shared_ptr<person> p3 (
+ new person (3, "Joe", "Dirt", 31, us, true, us));
+
+ shared_ptr<person> p4 (
+ new person (4, "Johan", "Johansen", 32, se, false, ca));
+
+ // employee
+ //
+ shared_ptr<employee> e1 (
+ new employee (1, "John", "Doe", 30, ca, true, za, st));
+
+ shared_ptr<employee> e2 (
+ new employee (2, "Jane", "Doe", 29, za, false, us, ct));
+ e2->husband = p1;
+
+ shared_ptr<employee> e3 (
+ new employee (3, "Joe", "Dirt", 31, us, true, us, st));
+
+ shared_ptr<employee> e4 (
+ new employee (4, "Johan", "Johansen", 32, se, false, ca, ct));
+
+ transaction t (db->begin ());
+ db->persist (ca);
+ db->persist (za);
+ db->persist (us);
+ db->persist (se);
+
+ db->persist (st);
+ db->persist (ct);
+
+ db->persist (p1);
+ db->persist (p2);
+ db->persist (p3);
+ db->persist (p4);
+
+ db->persist (e1);
+ db->persist (e2);
+ db->persist (e3);
+ db->persist (e4);
+ t.commit ();
+ }
+
+ typedef odb::query<person> p_query;
+ typedef odb::result<person> p_result;
+
+ typedef odb::query<employee> e_query;
+ typedef odb::result<employee> e_result;
+
+ // Make sure we have an independent JOIN for each relationship.
+ //
+ {
+ session s;
+ transaction t (db->begin ());
+
+ p_result pr (db->query<person> (
+ p_query::residence.location->code == "ZA"));
+ assert (size (pr) == 1);
+
+ e_result er (db->query<employee> (
+ e_query::residence.location->code == "ZA"));
+ assert (size (er) == 1);
+
+ t.commit ();
+ }
+
+ // Test Self-JOIN.
+ //
+ {
+ session s;
+ transaction t (db->begin ());
+
+ p_result pr (db->query<person> (p_query::husband->last_name == "Doe"));
+ assert (size (pr) == 1);
+
+ e_result er (db->query<employee> (e_query::husband->last_name == "Doe"));
+ assert (size (er) == 1);
+
+ t.commit ();
+ }
+
+ // Test query conditions from both base and derived.
+ //
+ {
+ session s;
+ transaction t (db->begin ());
+
+ e_result r (
+ db->query<employee> (
+ e_query::employed_by->name == "Simple Tech, Inc" &&
+ e_query::nationality->code == "US"));
+
+ assert (size (r) == 1);
+
+ t.commit ();
+ }
+
+ // Test second-level pointers.
+ //
+ {
+ session s;
+ transaction t (db->begin ());
+
+ p_result r (
+ db->query<person> (
+ p_query::husband->residence.location == "CA"));
+
+ assert (size (r) == 1);
+
+ t.commit ();
+ }
+ }
+ catch (const odb::exception& e)
+ {
+ cerr << e.what () << endl;
+ return 1;
+ }
+}
diff --git a/odb-tests/common/relationship/query/test.hxx b/odb-tests/common/relationship/query/test.hxx
new file mode 100644
index 0000000..c6e2d6d
--- /dev/null
+++ b/odb-tests/common/relationship/query/test.hxx
@@ -0,0 +1,140 @@
+// file : common/relationship-query/query/test.hxx
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <string>
+#include <memory>
+
+#include <odb/core.hxx>
+
+using std::shared_ptr;
+
+struct country;
+
+#pragma db value
+struct residence_info
+{
+ residence_info (bool p, shared_ptr<country> l)
+ : permanent (p), location (l)
+ {
+ }
+
+ residence_info ()
+ {
+ }
+
+ bool permanent;
+
+ #pragma db not_null
+ shared_ptr<country> location;
+};
+
+#pragma db object pointer(shared_ptr)
+struct person
+{
+ person (unsigned long i,
+ const std::string& fn,
+ const std::string& ln,
+ unsigned short a,
+ shared_ptr<country> r,
+ bool p,
+ shared_ptr<country> n)
+ : id (i),
+ first_name (fn),
+ last_name (ln),
+ age (a),
+ residence (p, r),
+ nationality (n)
+ {
+ }
+
+ person ()
+ {
+ }
+
+ #pragma db id
+ unsigned long id;
+
+ #pragma db column ("first")
+ std::string first_name;
+
+ #pragma db column ("last")
+ std::string last_name;
+
+ unsigned short age;
+
+ residence_info residence;
+
+ #pragma db not_null
+ shared_ptr<country> nationality;
+
+ shared_ptr<person> husband; // Self-join.
+};
+
+struct employer;
+
+#pragma db object pointer(shared_ptr)
+struct employee: person
+{
+ employee (unsigned long i,
+ const std::string& fn,
+ const std::string& ln,
+ unsigned short a,
+ shared_ptr<country> r,
+ bool p,
+ shared_ptr<country> n,
+ shared_ptr<employer> e)
+ : person (i, fn, ln, a, r, p, n),
+ employed_by (e)
+ {
+ }
+
+ employee ()
+ {
+ }
+
+ shared_ptr<employer> employed_by;
+};
+
+#pragma db object pointer(shared_ptr)
+struct employer
+{
+ employer (const std::string& n, shared_ptr<country> nat)
+ : name (n), nationality (nat)
+ {
+ }
+
+ employer ()
+ {
+ }
+
+ #pragma db id
+ std::string name;
+
+ // The same member name and type as in person (test JOIN alias).
+ //
+ #pragma db not_null
+ shared_ptr<country> nationality;
+};
+
+#pragma db object pointer(shared_ptr)
+struct country
+{
+ country (const std::string& c, const std::string& n)
+ : code (c), name (n)
+ {
+ }
+
+ country ()
+ {
+ }
+
+ #pragma db id
+ std::string code; // ISO 2-letter country code.
+
+ std::string name;
+};
+
+#endif // TEST_HXX
diff --git a/odb-tests/common/relationship/query/testscript b/odb-tests/common/relationship/query/testscript
new file mode 100644
index 0000000..d5ad419
--- /dev/null
+++ b/odb-tests/common/relationship/query/testscript
@@ -0,0 +1,33 @@
+# file : common/relationship/query/testscript
+# license : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
+: mysql
+:
+if $mysql
+{
+ .include ../../../mysql.testscript
+
+ $create_schema;
+ $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+ .include ../../../sqlite.testscript
+
+ $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+ .include ../../../pgsql.testscript
+
+ $create_schema;
+ $*
+}