aboutsummaryrefslogtreecommitdiff
path: root/common/container/basics
diff options
context:
space:
mode:
Diffstat (limited to 'common/container/basics')
-rw-r--r--common/container/basics/buildfile40
-rw-r--r--common/container/basics/driver.cxx34
-rw-r--r--common/container/basics/makefile117
-rw-r--r--common/container/basics/test.hxx40
-rw-r--r--common/container/basics/test.std0
-rw-r--r--common/container/basics/testscript33
6 files changed, 90 insertions, 174 deletions
diff --git a/common/container/basics/buildfile b/common/container/basics/buildfile
new file mode 100644
index 0000000..f83444e
--- /dev/null
+++ b/common/container/basics/buildfile
@@ -0,0 +1,40 @@
+# file : common/container/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_cont_bs_ \
+ --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/container/basics/driver.cxx b/common/container/basics/driver.cxx
index cdd22d6..14e1984 100644
--- a/common/container/basics/driver.cxx
+++ b/common/container/basics/driver.cxx
@@ -4,18 +4,20 @@
// Test basic container persistence.
//
-#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));
for (unsigned short i (0); i < 2; ++i)
{
@@ -37,7 +39,6 @@ main (int argc, char* argv[])
empty.num = 0;
empty.str = "";
-#ifdef HAVE_CXX11
// array
//
empty.na[0] = 123;
@@ -51,7 +52,6 @@ main (int argc, char* argv[])
empty.ca[0] = comp (123, "aaa");
empty.ca[1] = comp (234, "bbbb");
empty.ca[2] = comp (345, "ccccc");
-#endif
//
@@ -110,7 +110,6 @@ main (int argc, char* argv[])
med.csm[comp (123, "aaa")] = "aaa";
med.csm[comp (234, "bbbb")] = "bbbb";
-#ifdef HAVE_CXX11
// array
//
med.na[0] = 123;
@@ -160,7 +159,6 @@ main (int argc, char* argv[])
med.csum[comp (123, "aaa")] = "aaa";
med.csum[comp (234, "bbbb")] = "bbbb";
-#endif
//
// full
@@ -231,7 +229,6 @@ main (int argc, char* argv[])
full.csm[comp (2345, "bbbbb")] = "bbbbb";
full.csm[comp (3456, "cccccc")] = "cccccc";
-#ifdef HAVE_CXX11
// array
//
full.na[0] = 123;
@@ -291,7 +288,6 @@ main (int argc, char* argv[])
full.csum[comp (1234, "aaaa")] = "aaaa";
full.csum[comp (2345, "bbbbb")] = "bbbbb";
full.csum[comp (3456, "cccccc")] = "cccccc";
-#endif
// persist
//
@@ -307,9 +303,9 @@ main (int argc, char* argv[])
//
{
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"));
+ unique_ptr<object> e (db->load<object> ("empty"));
+ unique_ptr<object> m (db->load<object> ("medium"));
+ unique_ptr<object> f (db->load<object> ("full"));
t.commit ();
assert (empty == *e);
@@ -340,7 +336,6 @@ main (int argc, char* argv[])
empty.ncm[12] = comp (12, "aa");
empty.csm[comp (12, "aa")] = "aa";
-#ifdef HAVE_CXX11
empty.nfl.push_front (12);
empty.sfl.push_front ("aa");
empty.cfl.push_front (comp (12, "aa"));
@@ -353,7 +348,6 @@ main (int argc, char* argv[])
empty.snum["aa"] = 12;
empty.ncum[12] = comp (12, "aa");
empty.csum[comp (12, "aa")] = "aa";
-#endif
//
// med
@@ -380,7 +374,6 @@ main (int argc, char* argv[])
med.ncm.clear ();
med.csm.clear ();
-#ifdef HAVE_CXX11
med.nfl.clear ();
med.sfl.clear ();
med.cfl.clear ();
@@ -393,7 +386,6 @@ main (int argc, char* argv[])
med.snum.clear ();
med.ncum.clear ();
med.csum.clear ();
-#endif
//
// full
@@ -447,7 +439,6 @@ main (int argc, char* argv[])
full.csm[comp (3456, "cccccc")] += "c";
full.csm[comp (4567, "ddddddd")] = "ddddddd";
-#ifdef HAVE_CXX11
// array
//
full.na[0]++;
@@ -487,7 +478,6 @@ main (int argc, char* argv[])
full.csum[comp (3456, "cccccc")] += "c";
full.csum[comp (4567, "ddddddd1")] = "ddddddd";
-#endif
// update
//
@@ -503,9 +493,9 @@ main (int argc, char* argv[])
//
{
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"));
+ unique_ptr<object> e (db->load<object> ("empty"));
+ unique_ptr<object> m (db->load<object> ("medium"));
+ unique_ptr<object> f (db->load<object> ("full"));
t.commit ();
assert (empty == *e);
diff --git a/common/container/basics/makefile b/common/container/basics/makefile
deleted file mode 100644
index 3da6b71..0000000
--- a/common/container/basics/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file : common/container/basics/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_cont_bs_
-$(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/container/basics/test.hxx b/common/container/basics/test.hxx
index b7d50ae..e8e329e 100644
--- a/common/container/basics/test.hxx
+++ b/common/container/basics/test.hxx
@@ -4,21 +4,16 @@
#ifndef TEST_HXX
#define TEST_HXX
-#include <common/config.hxx> // HAVE_CXX11
-
#include <map>
#include <set>
#include <list>
#include <vector>
#include <deque>
+#include <array>
#include <string>
-
-#ifdef HAVE_CXX11
-# include <array>
-# include <forward_list>
-# include <unordered_map>
-# include <unordered_set>
-#endif
+#include <forward_list>
+#include <unordered_map>
+#include <unordered_set>
#include <odb/core.hxx>
@@ -29,7 +24,7 @@ struct comp
comp (int n, const std::string& s) : num (n), str (s) {}
#pragma db column("number")
- int num;
+ int num = 0;
std::string str;
};
@@ -66,7 +61,6 @@ typedef std::map<std::string, int> str_num_map;
typedef std::map<int, comp> num_comp_map;
typedef std::map<comp, std::string> comp_str_map;
-#ifdef HAVE_CXX11
struct comp_hash
{
std::size_t
@@ -92,7 +86,6 @@ typedef std::unordered_map<int, std::string> num_str_umap;
typedef std::unordered_map<std::string, int> str_num_umap;
typedef std::unordered_map<int, comp> num_comp_umap;
typedef std::unordered_map<comp, std::string, comp_hash> comp_str_umap;
-#endif
#pragma db value
struct cont_comp1
@@ -162,7 +155,6 @@ struct object
num_comp_map ncm;
comp_str_map csm;
-#ifdef HAVE_CXX11
// array
//
num_array na;
@@ -187,26 +179,6 @@ struct object
str_num_umap snum;
num_comp_umap ncum;
comp_str_umap csum;
-#else
- // Dummy containers to get the equivalent DROP TABLE statements.
- //
- num_vector na;
- num_vector sa;
- num_vector ca;
-
- num_vector nfl;
- num_vector sfl;
- num_vector cfl;
-
- num_set nus;
- str_set sus;
- comp_set cus;
-
- num_str_map nsum;
- str_num_map snum;
- num_comp_map ncum;
- comp_str_map csum;
-#endif
std::string str;
};
@@ -250,7 +222,6 @@ operator== (const object& x, const object& y)
x.ncm == y.ncm &&
x.csm == y.csm &&
-#ifdef HAVE_CXX11
x.na == y.na &&
x.sa == y.sa &&
x.ca == y.ca &&
@@ -267,7 +238,6 @@ operator== (const object& x, const object& y)
x.snum == y.snum &&
x.ncum == y.ncum &&
x.csum == y.csum &&
-#endif
x.str == y.str;
}
diff --git a/common/container/basics/test.std b/common/container/basics/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/container/basics/test.std
+++ /dev/null
diff --git a/common/container/basics/testscript b/common/container/basics/testscript
new file mode 100644
index 0000000..ea99498
--- /dev/null
+++ b/common/container/basics/testscript
@@ -0,0 +1,33 @@
+# file : common/container/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;
+ $*
+}