10 files changed, 175 insertions, 245 deletions
diff --git a/common/transaction/basics/buildfile b/common/transaction/basics/buildfile
new file mode 100644
index 0000000..f412235
--- /dev/null
+++ b/common/transaction/basics/buildfile
@@ -0,0 +1,13 @@
+# file      : common/transaction/basics/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+import libs  = libodb%lib{odb}
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{*} $libs testscript
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/common/transaction/basics/driver.cxx b/common/transaction/basics/driver.cxx
index 721561d..1833555 100644
--- a/common/transaction/basics/driver.cxx
+++ b/common/transaction/basics/driver.cxx
@@ -5,7 +5,7 @@
 //
 
 #include <string>
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/tracer.hxx>
@@ -14,8 +14,11 @@
 #include <odb/statement.hxx>
 #include <odb/exceptions.hxx>
 
-#include <common/common.hxx>
-#include <common/concrete.hxx>
+#include <libcommon/common.hxx>
+#include <libcommon/concrete.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace odb::core;
@@ -49,7 +52,7 @@ main (int argc, char* argv[])
 {
   {
     transaction_tracer tracer;
-    auto_ptr<database> db (create_database (argc, argv, false));
+    unique_ptr<database> db (create_database (argc, argv, false));
     db->tracer (tracer);
 
     assert (!transaction::has_current ());
@@ -137,7 +140,7 @@ main (int argc, char* argv[])
   // Test early connection release.
   //
   {
-    auto_ptr<database> db (create_database (argc, argv, false, 1));
+    unique_ptr<database> db (create_database (argc, argv, false, 1));
     transaction t1 (db->begin ());
     t1.commit ();
     transaction t2 (db->begin ());
diff --git a/common/transaction/basics/makefile b/common/transaction/basics/makefile
deleted file mode 100644
index a45080a..0000000
--- a/common/transaction/basics/makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# file      : common/transaction/basics/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.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
-
-# 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)
-
-$(call include-dep,$(cxx_od))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(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-schemaless-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-schemaless-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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/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/transaction/basics/test.std b/common/transaction/basics/test.std
deleted file mode 100644
index 37d3598..0000000
--- a/common/transaction/basics/test.std
+++ /dev/null
@@ -1,26 +0,0 @@
-test 001
-begin transaction
-begin transaction
-rollback transaction
-rollback transaction
-test 002
-begin transaction
-commit transaction
-test 003
-begin transaction
-rollback transaction
-test 004
-begin transaction
-rollback transaction
-test 005
-begin transaction
-already_in_transaction
-rollback transaction
-test 006
-begin transaction
-rollback transaction
-test 007
-begin transaction
-commit transaction
-begin transaction
-commit transaction
diff --git a/common/transaction/basics/testscript b/common/transaction/basics/testscript
new file mode 100644
index 0000000..94c58b6
--- /dev/null
+++ b/common/transaction/basics/testscript
@@ -0,0 +1,62 @@
+# file      : common/transaction/basics/testscript
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
++cat <<EOI >=output
+  test 001
+  begin transaction
+  begin transaction
+  rollback transaction
+  rollback transaction
+  test 002
+  begin transaction
+  commit transaction
+  test 003
+  begin transaction
+  rollback transaction
+  test 004
+  begin transaction
+  rollback transaction
+  test 005
+  begin transaction
+  already_in_transaction
+  rollback transaction
+  test 006
+  begin transaction
+  rollback transaction
+  test 007
+  begin transaction
+  commit transaction
+  begin transaction
+  commit transaction
+  EOI
+
+test.redirects += >>>../output
+
+: mysql
+:
+if $mysql
+{
+  .include ../../../mysql.testscript
+
+  $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+  .include ../../../sqlite.testscript
+
+  $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+  .include ../../../pgsql.testscript
+
+  $*
+}
diff --git a/common/transaction/callback/buildfile b/common/transaction/callback/buildfile
new file mode 100644
index 0000000..78b1b03
--- /dev/null
+++ b/common/transaction/callback/buildfile
@@ -0,0 +1,13 @@
+# file      : common/transaction/callback/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+import libs  = libodb%lib{odb}
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{*} $libs testscript
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/common/transaction/callback/driver.cxx b/common/transaction/callback/driver.cxx
index 90564a4..d0af993 100644
--- a/common/transaction/callback/driver.cxx
+++ b/common/transaction/callback/driver.cxx
@@ -4,14 +4,17 @@
 // Test transaction callbacks.
 //
 
-#include <cstddef> // std::size_t
-#include <cassert>
+#include <memory>   // std::unique_ptr
+#include <cstddef>  // std::size_t
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace odb::core;
@@ -104,7 +107,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv, false));
+    unique_ptr<database> db (create_database (argc, argv, false));
 
     // We want to test both stack and dynamic slots.
     //
diff --git a/common/transaction/callback/makefile b/common/transaction/callback/makefile
deleted file mode 100644
index 1d0be66..0000000
--- a/common/transaction/callback/makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# file      : common/transaction/callback/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.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
-
-# 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)
-
-$(call include-dep,$(cxx_od))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(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-schemaless-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-schemaless-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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/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/transaction/callback/test.std b/common/transaction/callback/test.std
deleted file mode 100644
index 4298c1e..0000000
--- a/common/transaction/callback/test.std
+++ /dev/null
@@ -1,36 +0,0 @@
-test 1/001
-  callback 1 commit
-  callback 1 rollback
-  callback 1 rollback
-  unregister callback 1
-  unregister callback 1
-  callback 2 commit
-test 1/002
-  unregister callback 2
-  callback 1 commit
-  callback 3 commit
-  unregister callback 2
-  callback 1 commit
-  callback 4 commit
-  callback 3 commit
-test 1/003
-  callback 1 commit
-  callback 2 commit
-test 2/001
-  callback 1 commit
-  callback 1 rollback
-  callback 1 rollback
-  unregister callback 1
-  unregister callback 1
-  callback 2 commit
-test 2/002
-  unregister callback 2
-  callback 1 commit
-  callback 3 commit
-  unregister callback 2
-  callback 1 commit
-  callback 4 commit
-  callback 3 commit
-test 2/003
-  callback 1 commit
-  callback 2 commit
diff --git a/common/transaction/callback/testscript b/common/transaction/callback/testscript
new file mode 100644
index 0000000..7229ecd
--- /dev/null
+++ b/common/transaction/callback/testscript
@@ -0,0 +1,72 @@
+# file      : common/transaction/callback/testscript
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
++cat <<EOI >=output
+  test 1/001
+    callback 1 commit
+    callback 1 rollback
+    callback 1 rollback
+    unregister callback 1
+    unregister callback 1
+    callback 2 commit
+  test 1/002
+    unregister callback 2
+    callback 1 commit
+    callback 3 commit
+    unregister callback 2
+    callback 1 commit
+    callback 4 commit
+    callback 3 commit
+  test 1/003
+    callback 1 commit
+    callback 2 commit
+  test 2/001
+    callback 1 commit
+    callback 1 rollback
+    callback 1 rollback
+    unregister callback 1
+    unregister callback 1
+    callback 2 commit
+  test 2/002
+    unregister callback 2
+    callback 1 commit
+    callback 3 commit
+    unregister callback 2
+    callback 1 commit
+    callback 4 commit
+    callback 3 commit
+  test 2/003
+    callback 1 commit
+    callback 2 commit
+  EOI
+
+test.redirects += >>>../output
+
+: mysql
+:
+if $mysql
+{
+  .include ../../../mysql.testscript
+
+  $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+  .include ../../../sqlite.testscript
+
+  $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+  .include ../../../pgsql.testscript
+
+  $*
+}