Switch to build2

15 files changed, 290 insertions, 413 deletions

diff --git a/common/id/auto/buildfile b/common/id/auto/buildfile
new file mode 100644
index 0000000..c340200
--- /dev/null
+++ b/common/id/auto/buildfile
@@ -0,0 +1,40 @@
+# file      : common/id/auto/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_id_auto_ \
+              --generate-schema
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/common/id/auto/driver.cxx b/common/id/auto/driver.cxx
index 19e0f14..d294e69 100644
--- a/common/id/auto/driver.cxx
+++ b/common/id/auto/driver.cxx
@@ -4,18 +4,20 @@
 // Test automatic id assignment.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 
@@ -24,7 +26,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // object
     //
@@ -52,9 +54,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> o1 (db->load<object> (id1));
-        auto_ptr<object> o2 (db->load<object> (id2));
-        auto_ptr<object> o3 (db->load<object> (id3));
+        unique_ptr<object> o1 (db->load<object> (id1));
+        unique_ptr<object> o2 (db->load<object> (id2));
+        unique_ptr<object> o3 (db->load<object> (id3));
         t.commit ();
 
         assert (o1->id_ == id1 && o1->str_ == "one");
@@ -79,7 +81,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<auto_only> o (db->load<auto_only> (id));
+        unique_ptr<auto_only> o (db->load<auto_only> (id));
         t.commit ();
 
         assert (o->id_ == id);
diff --git a/common/id/auto/makefile b/common/id/auto/makefile
deleted file mode 100644
index e0477ba..0000000
--- a/common/id/auto/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/id/auto/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test.hxx
-genf    := $(call odb-gen,$(odb_hdr))
-gen     := $(addprefix $(out_base)/,$(genf))
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --generate-schema \
---table-prefix t_id_auto_
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-ifneq ($(db_id),common)
-$(gen): odb_options += --database $(db_id)
-else
-$(gen): odb_options += --multi-database dynamic
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): data_dist := test.std
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(data_dist) $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../../template/Makefile.am)
-	$(call meta-vc8projs,../../template/template,$(name))
-	$(call meta-vc9projs,../../template/template,$(name))
-	$(call meta-vc10projs,../../template/template,$(name))
-	$(call meta-vc11projs,../../template/template,$(name))
-	$(call meta-vc12projs,../../template/template,$(name))
-
-# Test.
-#
-ifneq ($(db_id),common)
-$(eval $(call test-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/id/auto/test.std b/common/id/auto/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/id/auto/test.std
+++ /dev/null
diff --git a/common/id/auto/testscript b/common/id/auto/testscript
new file mode 100644
index 0000000..bb2a3a4
--- /dev/null
+++ b/common/id/auto/testscript
@@ -0,0 +1,33 @@
+# file      : common/id/auto/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/common/id/composite/buildfile b/common/id/composite/buildfile
new file mode 100644
index 0000000..4bc9f9a
--- /dev/null
+++ b/common/id/composite/buildfile
@@ -0,0 +1,42 @@
+# file      : common/id/composite/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_id_comp_ \
+              --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/common/id/composite/driver.cxx b/common/id/composite/driver.cxx
index f394091..3d66101 100644
--- a/common/id/composite/driver.cxx
+++ b/common/id/composite/driver.cxx
@@ -4,19 +4,21 @@
 // Test composite object ids.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/session.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 
@@ -25,7 +27,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test 1.
     //
@@ -55,9 +57,9 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id));
-        auto_ptr<object> p2 (db->load<object> (o2.id));
-        auto_ptr<object> p3 (db->load<object> (o3.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id));
+        unique_ptr<object> p2 (db->load<object> (o2.id));
+        unique_ptr<object> p3 (db->load<object> (o3.id));
         t.commit ();
 
         assert (*p1 == o1);
@@ -69,7 +71,7 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->load<object> (o1.id));
+        unique_ptr<object> p (db->load<object> (o1.id));
         p->num++;
         db->update (*p);
         t.commit ();
@@ -77,7 +79,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->load<object> (o1.id));
+        unique_ptr<object> p (db->load<object> (o1.id));
         t.commit ();
 
         assert (p->num == o1.num + 1);
@@ -93,7 +95,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->find<object> (o1.id));
+        unique_ptr<object> p (db->find<object> (o1.id));
         assert (p.get () == 0);
         t.commit ();
       }
@@ -134,9 +136,9 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object2> p2 (db->load<object2> (o2.id));
-        auto_ptr<object3> p3 (db->load<object3> (o3.id));
-        auto_ptr<object4> p4 (db->load<object4> (o4.id));
+        unique_ptr<object2> p2 (db->load<object2> (o2.id));
+        unique_ptr<object3> p3 (db->load<object3> (o3.id));
+        unique_ptr<object4> p4 (db->load<object4> (o4.id));
         t.commit ();
 
         assert (p2->o1->id == o2.o1->id);
@@ -155,13 +157,13 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
 
-          auto_ptr<object2> p2 (db->load<object2> (o2.id));
+          unique_ptr<object2> p2 (db->load<object2> (o2.id));
           delete p2->o1;
           p2->o1 = new object1 (scomp ("o1", "o2", "bbb"));
           id2 = db->persist (p2->o1);
           db->update (*p2);
 
-          auto_ptr<object3> p3 (db->load<object3> (o3.id));
+          unique_ptr<object3> p3 (db->load<object3> (o3.id));
           delete p3->o1.back ();
           p3->o1.pop_back ();
           p3->o1.push_back (new object1 (scomp ("o1", "o3", "ccc")));
@@ -173,8 +175,8 @@ main (int argc, char* argv[])
 
         {
           transaction t (db->begin ());
-          auto_ptr<object2> p2 (db->load<object2> (o2.id));
-          auto_ptr<object3> p3 (db->load<object3> (o3.id));
+          unique_ptr<object2> p2 (db->load<object2> (o2.id));
+          unique_ptr<object3> p3 (db->load<object3> (o3.id));
           t.commit ();
 
           assert (p2->o1->id == id2);
@@ -298,7 +300,7 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-        auto_ptr<object2> p2 (db->load<object2> (o2.id));
+        unique_ptr<object2> p2 (db->load<object2> (o2.id));
         t.commit ();
 
         assert (p2->o1->o2->id == o2.id);
@@ -375,7 +377,7 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-        auto_ptr<object2> p2 (db->load<object2> (o2.id));
+        unique_ptr<object2> p2 (db->load<object2> (o2.id));
         t.commit ();
 
         assert (p2->o1.size () == 2);
@@ -458,7 +460,7 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-        auto_ptr<object2> p2 (db->load<object2> (o2.id));
+        unique_ptr<object2> p2 (db->load<object2> (o2.id));
         t.commit ();
 
         assert (p2->o1.size () == 2);
@@ -519,7 +521,7 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-        auto_ptr<object2> p2 (db->load<object2> (o2.id));
+        unique_ptr<object2> p2 (db->load<object2> (o2.id));
         t.commit ();
 
         assert (p2->o1.size () == 2);
@@ -571,7 +573,7 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->load<object> (o.id));
+        unique_ptr<object> p (db->load<object> (o.id));
         t.commit ();
 
         assert (*p == o);
@@ -581,7 +583,7 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->load<object> (o.id));
+        unique_ptr<object> p (db->load<object> (o.id));
         p->num++;
         db->update (*p);
 
@@ -599,7 +601,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p (db->load<object> (o.id));
+        unique_ptr<object> p (db->load<object> (o.id));
         t.commit ();
 
         assert (p->num == o.num + 1);
@@ -651,9 +653,9 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object2> p2a (db->load<object2> (o2a.id));
-        auto_ptr<object2> p2b (db->load<object2> (o2b.id));
-        auto_ptr<object3> p3 (db->load<object3> (o3.id));
+        unique_ptr<object2> p2a (db->load<object2> (o2a.id));
+        unique_ptr<object2> p2b (db->load<object2> (o2b.id));
+        unique_ptr<object3> p3 (db->load<object3> (o3.id));
         t.commit ();
 
         assert (p2a->o1 == 0);
@@ -683,9 +685,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object2> p2a (db->load<object2> (o2a.id));
-        auto_ptr<object2> p2b (db->load<object2> (o2b.id));
-        auto_ptr<object3> p3 (db->load<object3> (o3.id));
+        unique_ptr<object2> p2a (db->load<object2> (o2a.id));
+        unique_ptr<object2> p2b (db->load<object2> (o2b.id));
+        unique_ptr<object3> p3 (db->load<object3> (o3.id));
         t.commit ();
 
         assert (p2a->o1 != 0 && *p2a->o1 == *o2a.o1);
diff --git a/common/id/composite/makefile b/common/id/composite/makefile
deleted file mode 100644
index 3edac7f..0000000
--- a/common/id/composite/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/id/composite/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test.hxx
-genf    := $(call odb-gen,$(odb_hdr))
-gen     := $(addprefix $(out_base)/,$(genf))
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --generate-schema --generate-query \
---generate-session --table-prefix t_id_comp_
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-ifneq ($(db_id),common)
-$(gen): odb_options += --database $(db_id)
-else
-$(gen): odb_options += --multi-database dynamic
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): data_dist := test.std
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(data_dist) $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../../template/Makefile.am)
-	$(call meta-vc8projs,../../template/template,$(name))
-	$(call meta-vc9projs,../../template/template,$(name))
-	$(call meta-vc10projs,../../template/template,$(name))
-	$(call meta-vc11projs,../../template/template,$(name))
-	$(call meta-vc12projs,../../template/template,$(name))
-
-# Test.
-#
-ifneq ($(db_id),common)
-$(eval $(call test-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/id/composite/test.std b/common/id/composite/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/id/composite/test.std
+++ /dev/null
diff --git a/common/id/composite/testscript b/common/id/composite/testscript
new file mode 100644
index 0000000..f87d4bc
--- /dev/null
+++ b/common/id/composite/testscript
@@ -0,0 +1,33 @@
+# file      : common/id/composite/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/common/id/nested/buildfile b/common/id/nested/buildfile
new file mode 100644
index 0000000..777cb65
--- /dev/null
+++ b/common/id/nested/buildfile
@@ -0,0 +1,41 @@
+# file      : common/nested/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_id_nested_ \
+              --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/common/id/nested/driver.cxx b/common/id/nested/driver.cxx
index 57647fd..92a80f6 100644
--- a/common/id/nested/driver.cxx
+++ b/common/id/nested/driver.cxx
@@ -4,19 +4,21 @@
 // Test nested ids.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/session.hxx>
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 
@@ -27,7 +29,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
 
     // Simple nested id.
@@ -54,9 +56,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
-        auto_ptr<object1> p (db->load<object1> (o.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<object1> p (db->load<object1> (o.id));
         t.commit ();
 
         assert (*p1 == o1);
@@ -86,9 +88,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
-        auto_ptr<object1> p (db->load<object1> (o.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<object1> p (db->load<object1> (o.id));
         t.commit ();
 
         assert (*p1 == o1);
@@ -122,9 +124,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.c));
-        auto_ptr<object> p2 (db->load<object> (o2.id.c));
-        auto_ptr<object1> p (db->load<object1> (o.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id.c));
+        unique_ptr<object> p2 (db->load<object> (o2.id.c));
+        unique_ptr<object1> p (db->load<object1> (o.id));
         t.commit ();
 
         assert (*p1 == o1);
@@ -154,9 +156,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.c));
-        auto_ptr<object> p2 (db->load<object> (o2.id.c));
-        auto_ptr<object1> p (db->load<object1> (o.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id.c));
+        unique_ptr<object> p2 (db->load<object> (o2.id.c));
+        unique_ptr<object1> p (db->load<object1> (o.id));
         t.commit ();
 
         assert (*p1 == o1);
@@ -182,8 +184,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<object> p1 (db->load<object> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
         t.commit ();
 
         assert (*p1 == o1);
@@ -202,8 +204,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<object> p1 (db->load<object> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
         t.commit ();
 
         assert (*p1 == o1);
@@ -228,8 +230,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> p1 (db->load<base> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<base> p1 (db->load<base> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
         t.commit ();
 
         assert (*p1 == o1);
@@ -247,8 +249,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> p1 (db->load<base> (o1.id.y));
-        auto_ptr<object> p2 (db->load<object> (o2.id.y));
+        unique_ptr<base> p1 (db->load<base> (o1.id.y));
+        unique_ptr<object> p2 (db->load<object> (o2.id.y));
         t.commit ();
 
         assert (*p1 == o1);
diff --git a/common/id/nested/makefile b/common/id/nested/makefile
deleted file mode 100644
index 120a8f0..0000000
--- a/common/id/nested/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/id/nested/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test.hxx
-genf    := $(call odb-gen,$(odb_hdr))
-gen     := $(addprefix $(out_base)/,$(genf))
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --generate-schema --generate-query \
---table-prefix t_id_nested_
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-ifneq ($(db_id),common)
-$(gen): odb_options += --database $(db_id)
-else
-$(gen): odb_options += --multi-database dynamic
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): data_dist := test.std
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(data_dist) $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../../template/Makefile.am)
-	$(call meta-vc8projs,../../template/template,$(name))
-	$(call meta-vc9projs,../../template/template,$(name))
-	$(call meta-vc10projs,../../template/template,$(name))
-	$(call meta-vc11projs,../../template/template,$(name))
-	$(call meta-vc12projs,../../template/template,$(name))
-
-# Test.
-#
-ifneq ($(db_id),common)
-$(eval $(call test-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/id/nested/test.std b/common/id/nested/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/id/nested/test.std
+++ /dev/null
diff --git a/common/id/nested/testscript b/common/id/nested/testscript
new file mode 100644
index 0000000..89e8d7a
--- /dev/null
+++ b/common/id/nested/testscript
@@ -0,0 +1,33 @@
+# file      : common/nested/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;
+  $*
+}