Add boost/common/smart-ptr and boost/common/unordered tests

9 files changed, 798 insertions, 0 deletions

diff --git a/boost/common/makefile b/boost/common/makefile
index 4af0162..5bb9732 100644
--- a/boost/common/makefile
+++ b/boost/common/makefile
@@ -6,6 +6,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 tests :=      \
+unordered     \
+smart-ptr     \
 template
 
 all_tests := $(tests)
diff --git a/boost/common/smart-ptr/driver.cxx b/boost/common/smart-ptr/driver.cxx
new file mode 100644
index 0000000..478e4a9
--- /dev/null
+++ b/boost/common/smart-ptr/driver.cxx
@@ -0,0 +1,178 @@
+// file      : boost/common/smart-ptr/driver.cxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test boost smart pointers.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/mysql/database.hxx>
+#include <odb/mysql/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+using namespace std;
+
+using namespace odb::boost;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  using boost::shared_ptr;
+
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    shared_ptr<cont> c1 (new cont (1));
+    {
+      transaction t (db->begin ());
+      db->persist (c1);
+      t.commit ();
+    }
+
+    // Test comparison operators.
+    //
+    {
+      assert (lazy_shared_ptr<cont> () == lazy_shared_ptr<cont> ());
+      assert (lazy_shared_ptr<cont> () != lazy_shared_ptr<cont> (c1));
+      assert (lazy_shared_ptr<cont> (c1) == lazy_shared_ptr<cont> (c1));
+
+      lazy_shared_ptr<cont> lc1 (*db, 1);
+      assert (lc1 != lazy_shared_ptr<cont> ());
+      assert (lc1 == lazy_shared_ptr<cont> (*db, c1));
+
+      shared_ptr<cont> c2 (new cont (2));
+      assert (lc1 != lazy_shared_ptr<cont> (*db, c2));
+    }
+
+    // Test swap.
+    //
+    {
+      lazy_shared_ptr<cont> lx (*db, 1), ly;
+      assert (lx == lazy_shared_ptr<cont> (*db, c1));
+
+      swap (lx, ly);
+      assert (lx == lazy_shared_ptr<cont> ());
+      assert (ly == lazy_shared_ptr<cont> (*db, c1));
+    }
+
+    // Test assignment from auto_ptr.
+    //
+    {
+      cont* p = new cont (3);
+      auto_ptr<cont> a (p);
+      lazy_shared_ptr<cont> l;
+      l = a;
+
+      assert (l.get() == p);
+      assert (!a.get ());
+    }
+
+    shared_ptr<obj> o1 (new obj (1));
+    shared_ptr<obj> o2 (new obj (2));
+    shared_ptr<obj> o3 (new obj (3));
+    shared_ptr<obj> o4 (new obj (4));
+    shared_ptr<cont> c2 (new cont (2));
+
+    o1->c = c1;
+    o2->c = c1;
+    o3->c = c2;
+    o4->c = c2;
+
+    // Persist.
+    //
+    {
+      transaction t (db->begin ());
+
+      db->persist (o1);
+      db->persist (o2);
+      db->persist (o3);
+      db->persist (o4);
+      db->persist (c2);
+
+      t.commit ();
+    }
+
+    // Load.
+    //
+    {
+      session s;
+      transaction t (db->begin ());
+
+      shared_ptr<cont> c (db->load<cont> (1));
+      shared_ptr<obj> o (db->load<obj> (1));
+
+      // Ensure that lazy pointers are present but not loaded.
+      //
+      assert (c->o.size () == 2);
+      assert (!c->o[0].loaded ());
+      assert (!c->o[1].loaded ());
+      assert (!o->c.loaded ());
+
+      // Ensure that the correct object IDs were loaded.
+      //
+      assert (c->o[0].object_id<obj> () == 1);
+      assert (c->o[1].object_id<obj> () == 2);
+      assert (o->c.object_id<obj> () == 1);
+
+      // Load the lazy pointer targets ensuring that the loaded
+      // targets correspond to the cached session objects.
+      //
+      shared_ptr<cont> cl (o->c.load ());
+      shared_ptr<obj> ol (c->o[0].load ());
+
+      assert (c->o[0].loaded ());
+      assert (o->c.loaded ());
+
+      assert (cl == c);
+      assert (ol == o);
+
+      t.commit ();
+    }
+
+    // Test lazy weak locking and reloading.
+    //
+    {
+      // No session.
+      //
+      transaction t (db->begin ());
+      shared_ptr<cont> c (db->load<cont> (1));
+
+      // Lock.
+      //
+      assert (!c->o[1].loaded ());
+      lazy_shared_ptr<obj> l (c->o[1].lock ());
+      assert (!l.loaded ());
+      assert (l.object_id<obj> () == c->o[1].object_id<obj> ());
+
+      // Reload.
+      //
+      assert (!c->o[1].loaded ());
+
+      shared_ptr<obj> ol (c->o[1].load ());
+      assert (c->o[1].loaded ());
+
+      ol.reset ();
+      assert (!c->o[1].loaded ());
+
+      ol = c->o[1].load ();
+      assert (c->o[1].loaded ());
+
+      t.commit ();
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile
new file mode 100644
index 0000000..f18c095
--- /dev/null
+++ b/boost/common/smart-ptr/makefile
@@ -0,0 +1,119 @@
+# file      : boost/common/smart-ptr/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+odb_hdr := test.hxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+
+# Import.
+#
+$(call import,\
+  $(scf_root)/import/odb/stub.make,\
+  odb: odb,odb-rules: odb_rules)
+
+$(call import,\
+  $(scf_root)/import/libodb-boost/stub.make,\
+  l: odb_boost.l,cpp-options: odb_boost.l.cpp-options)
+
+$(call import,\
+  $(scf_root)/import/libboost/header-only/stub.make,\
+  cpp-options: boost.l.cpp-options)
+
+# Build.
+#
+$(driver): $(cxx_obj) $(odb_boost.l) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
+$(boost.l.cpp-options)
+
+genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --database $(db_id) \
+--profile boost/smart-ptr --generate-schema
+$(gen): cpp_options := -I$(out_base)
+$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
+$(boost.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(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))
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
+	$(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))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(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/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(odb_rules))
+$(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/boost/common/smart-ptr/test.hxx b/boost/common/smart-ptr/test.hxx
new file mode 100644
index 0000000..ea158e7
--- /dev/null
+++ b/boost/common/smart-ptr/test.hxx
@@ -0,0 +1,59 @@
+// file      : boost/common/smart-ptr/test.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <vector>
+
+#include <odb/core.hxx>
+#include <odb/boost/smart-ptr/lazy-ptr.hxx>
+
+struct obj;
+
+using odb::boost::lazy_shared_ptr;
+using odb::boost::lazy_weak_ptr;
+
+#pragma db object
+struct cont
+{
+  cont ()
+  {
+  }
+
+  cont (unsigned long id)
+      : id (id)
+  {
+  }
+
+  #pragma db id
+  unsigned long id;
+
+  typedef std::vector<lazy_weak_ptr<obj> > obj_list;
+
+  #pragma db inverse(c) not_null
+  obj_list o;
+};
+
+#pragma db object
+struct obj
+{
+  obj ()
+  {
+  }
+
+  obj (unsigned long id)
+      : id (id)
+  {
+  }
+
+  #pragma db id
+  unsigned long id;
+
+  #pragma db not_null
+  lazy_shared_ptr<cont> c;
+};
+
+#endif // TEST_HXX
diff --git a/boost/common/smart-ptr/test.std b/boost/common/smart-ptr/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/boost/common/smart-ptr/test.std
diff --git a/boost/common/unordered/driver.cxx b/boost/common/unordered/driver.cxx
new file mode 100644
index 0000000..3750e58
--- /dev/null
+++ b/boost/common/unordered/driver.cxx
@@ -0,0 +1,214 @@
+// file      : boost/common/unordered/driver.cxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test boost container persistence.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    for (unsigned short i (0); i < 2; ++i)
+    {
+      object empty ("empty"), med ("medium"), full ("full");
+
+      //
+      // empty
+      //
+
+      //
+      // med
+      //
+
+      // set
+      //
+      med.ns.insert (123);
+      med.ns.insert (234);
+
+      med.ss.insert ("aaa");
+      med.ss.insert ("bbbb");
+
+      med.cms.insert (comp (123, "aaa"));
+      med.cms.insert (comp (234, "bbbb"));
+
+      // map
+      //
+      med.nsm[123] = "aaa";
+      med.nsm[234] = "bbbb";
+
+      med.snm["aaa"] = 123;
+      med.snm["bbbb"] = 234;
+
+      med.ncm[123] = comp (123, "aaa");
+      med.ncm[234] = comp (234, "bbbb");
+
+      med.csmm.insert (
+        comp_str_multimap::value_type (comp (123, "aaa"), "aaa"));
+      med.csmm.insert (
+        comp_str_multimap::value_type (comp (234, "bbbb"), "bbbb"));
+
+      //
+      // full
+      //
+
+      // set
+      //
+      full.ns.insert (1234);
+      full.ns.insert (2345);
+      full.ns.insert (3456);
+
+      full.ss.insert ("aaaa");
+      full.ss.insert ("bbbbb");
+      full.ss.insert ("cccccc");
+
+      full.cms.insert (comp (1234, "aaaa"));
+      full.cms.insert (comp (2345, "bbbbb"));
+      full.cms.insert (comp (3456, "cccccc"));
+
+      // map
+      //
+      full.nsm[1234] = "aaaa";
+      full.nsm[2345] = "bbbbb";
+      full.nsm[3456] = "cccccc";
+
+      full.snm["aaaa"] = 1234;
+      full.snm["bbbbb"] = 2345;
+      full.snm["cccccc"] = 3456;
+
+      full.ncm[1234] = comp (1234, "aaaa");
+      full.ncm[2345] = comp (2345, "bbbbb");
+      full.ncm[3456] = comp (3456, "cccccc");
+
+      full.csmm.insert (
+        comp_str_multimap::value_type (comp (1234, "aaaa"), "aaaa"));
+      full.csmm.insert (
+        comp_str_multimap::value_type (comp (2345, "bbbbb"), "bbbbb"));
+      full.csmm.insert (
+        comp_str_multimap::value_type (comp (3456, "cccccc"), "cccccc"));
+
+      // persist
+      //
+      {
+        transaction t (db->begin ());
+        db->persist (empty);
+        db->persist (med);
+        db->persist (full);
+        t.commit ();
+      }
+
+      // load & check
+      //
+      {
+        transaction t (db->begin ());
+        auto_ptr<object> e (db->load<object> ("empty"));
+        auto_ptr<object> m (db->load<object> ("medium"));
+        auto_ptr<object> f (db->load<object> ("full"));
+        t.commit ();
+
+        assert (empty == *e);
+        assert (med == *m);
+        assert (full == *f);
+      }
+
+      // empty
+      //
+      empty.ns.insert (12);
+      empty.ss.insert ("aa");
+      empty.cms.insert (comp (12, "aa"));
+
+      empty.nsm[12] = "aa";
+      empty.snm["aa"] = 12;
+      empty.ncm[12] = comp (12, "aa");
+      empty.csmm.insert (
+        comp_str_multimap::value_type (comp (12, "aa"), "aa"));
+
+      // med
+      //
+      med.ns.clear ();
+      med.ss.clear ();
+      med.cms.clear ();
+
+      med.nsm.clear ();
+      med.snm.clear ();
+      med.ncm.clear ();
+      med.csmm.clear ();
+
+      // full
+      //
+      full.ns.insert (4567);
+      full.ss.insert ("ddddddd");
+      full.cms.insert (comp (4567, "ddddddd"));
+
+      full.nsm[3456] += 'c';
+      full.nsm[4567] = "ddddddd";
+      full.snm["cccccc"]++;
+      full.snm["ddddddd"] = 4567;
+      full.ncm[3456].num++;
+      full.ncm[3456].str += 'c';
+      full.ncm[4567] = comp (4567, "ddddddd");
+      full.csmm.find (comp (3456, "cccccc"))->second += "c";
+      full.csmm.insert (
+        comp_str_multimap::value_type (comp (4567, "ddddddd"), "ddddddd"));
+
+      // update
+      //
+      {
+        transaction t (db->begin ());
+        db->update (empty);
+        db->update (med);
+        db->update (full);
+        t.commit ();
+      }
+
+      // load & check
+      //
+      {
+        transaction t (db->begin ());
+        auto_ptr<object> e (db->load<object> ("empty"));
+        auto_ptr<object> m (db->load<object> ("medium"));
+        auto_ptr<object> f (db->load<object> ("full"));
+        t.commit ();
+
+        assert (empty == *e);
+        assert (med == *m);
+        assert (full == *f);
+      }
+
+      // erase
+      //
+      if (i == 0)
+      {
+        transaction t (db->begin ());
+        db->erase<object> ("empty");
+        db->erase<object> ("medium");
+        db->erase<object> ("full");
+        t.commit ();
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile
new file mode 100644
index 0000000..40ee870
--- /dev/null
+++ b/boost/common/unordered/makefile
@@ -0,0 +1,119 @@
+# file      : boost/common/unordered/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+odb_hdr := test.hxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+
+# Import.
+#
+$(call import,\
+  $(scf_root)/import/odb/stub.make,\
+  odb: odb,odb-rules: odb_rules)
+
+$(call import,\
+  $(scf_root)/import/libodb-boost/stub.make,\
+  l: odb_boost.l,cpp-options: odb_boost.l.cpp-options)
+
+$(call import,\
+  $(scf_root)/import/libboost/header-only/stub.make,\
+  cpp-options: boost.l.cpp-options)
+
+# Build.
+#
+$(driver): $(cxx_obj) $(odb_boost.l) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
+$(boost.l.cpp-options)
+
+genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --database $(db_id) \
+--profile boost/unordered --generate-schema
+$(gen): cpp_options := -I$(out_base)
+$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
+$(boost.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(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))
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
+	$(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))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(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/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(odb_rules))
+$(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/boost/common/unordered/test.hxx b/boost/common/unordered/test.hxx
new file mode 100644
index 0000000..02ed5bd
--- /dev/null
+++ b/boost/common/unordered/test.hxx
@@ -0,0 +1,107 @@
+// file      : boost/common/unordered/test.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
+
+#include <odb/core.hxx>
+
+#pragma db value
+struct comp
+{
+  comp () {}
+  comp (int n, const std::string& s) : num (n), str (s) {}
+
+  #pragma db column("number")
+  int num;
+  std::string str;
+};
+
+inline bool
+operator== (const comp& x, const comp& y)
+{
+  return x.num == y.num && x.str == y.str;
+}
+
+inline bool
+operator< (const comp& x, const comp& y)
+{
+  return x.num != y.num ? x.num < y.num : x.str < y.str;
+}
+
+inline std::size_t
+hash_value (const comp& x)
+{
+  std::size_t seed = 0;
+  boost::hash_combine (seed, x.num);
+  boost::hash_combine (seed, x.str);
+  return seed;
+}
+
+using boost::unordered_set;
+using boost::unordered_multiset;
+
+typedef unordered_set<int> num_set;
+typedef unordered_set<std::string> str_set;
+typedef unordered_multiset<comp> comp_multiset;
+
+using boost::unordered_map;
+using boost::unordered_multimap;
+
+typedef unordered_map<int, std::string> num_str_map;
+typedef unordered_map<std::string, int> str_num_map;
+typedef unordered_map<int, comp> num_comp_map;
+typedef unordered_multimap<comp, std::string> comp_str_multimap;
+
+#pragma db object
+struct object
+{
+  object ()
+  {
+  }
+
+  object (const std::string& id)
+      : id (id)
+  {
+  }
+
+
+  #pragma db id
+  std::string id;
+
+  // set
+  //
+  num_set ns;
+  str_set ss;
+  comp_multiset cms;
+
+  // map
+  //
+  num_str_map nsm;
+  str_num_map snm;
+  num_comp_map ncm;
+  comp_str_multimap csmm;
+};
+
+inline bool
+operator== (const object& x, const object& y)
+{
+  return
+    x.id == y.id &&
+
+    x.ns == y.ns &&
+    x.ss == y.ss &&
+    x.cms == y.cms &&
+
+    x.nsm == y.nsm &&
+    x.snm == y.snm &&
+    x.ncm == y.ncm &&
+    x.csmm == y.csmm;
+}
+
+#endif // TEST_HXX
diff --git a/boost/common/unordered/test.std b/boost/common/unordered/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/boost/common/unordered/test.std