Add support for post-commit/rollback callbacks

New test: common/transaction/callback.

3 files changed, 264 insertions, 0 deletions

diff --git a/common/transaction/basics/driver.cxx b/common/transaction/basics/driver.cxx
new file mode 100644
index 0000000..984e9e8
--- /dev/null
+++ b/common/transaction/basics/driver.cxx
@@ -0,0 +1,149 @@
+// file      : common/transaction/basics/driver.cxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test basic transaction operations.
+//
+
+#include <string>
+#include <cassert>
+#include <iostream>
+
+#include <odb/tracer.hxx>
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/statement.hxx>
+#include <odb/exceptions.hxx>
+
+#include <common/common.hxx>
+#include <common/concrete.hxx>
+
+using namespace std;
+using namespace odb::core;
+
+struct transaction_tracer: odb::tracer
+{
+  virtual void
+  execute (connection&, const char* s)
+  {
+    string str (s);
+
+    if (str == "BEGIN")
+      cout << "begin transaction" << endl;
+    else if (str == "COMMIT")
+      cout << "commit transaction" << endl;
+    else if (str == "ROLLBACK")
+      cout << "rollback transaction" << endl;
+  }
+
+  // Override the other version to get rid of a Sun CC warning.
+  //
+  virtual void
+  execute (connection& c, const statement& s)
+  {
+    execute (c, s.text ());
+  }
+};
+
+int
+main (int argc, char* argv[])
+{
+  {
+    transaction_tracer tracer;
+    auto_ptr<database> db (create_database (argc, argv, false));
+    db->tracer (tracer);
+
+    assert (!transaction::has_current ());
+
+    // Current and db accessors.
+    //
+    cout << "test 001" << endl;
+    {
+      transaction t (db->begin ());
+      assert (&t.database () == db.get ());
+      assert (transaction::has_current ());
+      assert (&transaction::current () == &t);
+
+      transaction::reset_current ();
+      assert (!transaction::has_current ());
+
+      transaction t2 (db->begin (), false);
+      assert (!transaction::has_current ());
+
+      transaction::current (t2);
+      assert (&transaction::current () == &t2);
+    }
+
+    // Commit.
+    //
+    cout << "test 002" << endl;
+    {
+      transaction t (db->begin ());
+      t.commit ();
+    }
+
+    // Rollback.
+    //
+    cout << "test 003" << endl;
+    {
+      transaction t (db->begin ());
+      t.rollback ();
+    }
+
+    // Auto rollback.
+    //
+    cout << "test 004" << endl;
+    {
+      transaction t (db->begin ());
+    }
+
+    // Nested transaction.
+    //
+    cout << "test 005" << endl;
+    {
+      transaction t (db->begin ());
+
+      try
+      {
+        transaction n (db->begin ());
+      }
+      catch (const already_in_transaction&)
+      {
+        cout << "already_in_transaction" << endl;
+      }
+    }
+
+    // Concrete transaction type.
+    //
+    cout << "test 006" << endl;
+    {
+      assert (sizeof (odb_db::transaction) == sizeof (transaction));
+
+      odb_db::transaction t (static_cast<odb_db::database&> (*db).begin ());
+      odb_db::transaction& r (odb_db::transaction::current ());
+      assert (&t == &r);
+    }
+
+    // Transaction restart.
+    //
+    cout << "test 007" << endl;
+    {
+      transaction t (db->begin ());
+      t.commit ();
+      t.reset (db->begin ());
+      t.commit ();
+    }
+  }
+
+  // Test early connection release.
+  //
+  {
+    auto_ptr<database> db (create_database (argc, argv, false, 1));
+    transaction t1 (db->begin ());
+    t1.commit ();
+    transaction t2 (db->begin ());
+    t2.rollback ();
+    transaction t3 (db->begin ());
+    t3.commit ();
+  }
+}
diff --git a/common/transaction/basics/makefile b/common/transaction/basics/makefile
new file mode 100644
index 0000000..dbee915
--- /dev/null
+++ b/common/transaction/basics/makefile
@@ -0,0 +1,89 @@
+# file      : common/transaction/basics/makefile
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# 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
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# 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): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(data_dist))
+	$(call meta-automake,../../template/Makefile.am)
+	$(call meta-vc9projs,../../template/template,$(name))
+	$(call meta-vc10projs,../../template/template,$(name))
+	$(call meta-vc11projs,../../template/template,$(name))
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
+
+# 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/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/vc11proj.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
new file mode 100644
index 0000000..37d3598
--- /dev/null
+++ b/common/transaction/basics/test.std
@@ -0,0 +1,26 @@
+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