aboutsummaryrefslogtreecommitdiff
path: root/common/enum
diff options
context:
space:
mode:
Diffstat (limited to 'common/enum')
-rw-r--r--common/enum/buildfile41
-rw-r--r--common/enum/driver.cxx16
-rw-r--r--common/enum/makefile117
-rw-r--r--common/enum/test.hxx7
-rw-r--r--common/enum/test.std0
-rw-r--r--common/enum/testscript33
6 files changed, 81 insertions, 133 deletions
diff --git a/common/enum/buildfile b/common/enum/buildfile
new file mode 100644
index 0000000..eb3a29a
--- /dev/null
+++ b/common/enum/buildfile
@@ -0,0 +1,41 @@
+# file : common/enum/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 enum_ \
+ --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/enum/driver.cxx b/common/enum/driver.cxx
index e9b4bfb..ed3eb59 100644
--- a/common/enum/driver.cxx
+++ b/common/enum/driver.cxx
@@ -4,18 +4,20 @@
// Test automatic C++ enum mapping.
//
-#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;
@@ -27,18 +29,16 @@ main (int argc, char* argv[])
typedef odb::query<object> query;
typedef odb::result<object> result;
- auto_ptr<database> db (create_database (argc, argv));
+ unique_ptr<database> db (create_database (argc, argv));
object o;
o.color_ = green;
o.taste_ = object::sweet;
o.position_ = object::left;
-#ifdef HAVE_CXX11_ENUM
o.gender_ = object::gender::female;
o.scale_ = object::scale::ten;
o.yesno_ = object::yesno::yes;
-#endif
{
transaction t (db->begin ());
@@ -48,7 +48,7 @@ main (int argc, char* argv[])
{
transaction t (db->begin ());
- auto_ptr<object> o1 (db->load<object> (o.id_));
+ unique_ptr<object> o1 (db->load<object> (o.id_));
t.commit ();
assert (o == *o1);
@@ -65,7 +65,6 @@ main (int argc, char* argv[])
assert (!r2.empty ());
assert (!r3.empty ());
-#ifdef HAVE_CXX11_ENUM
result r4 (db->query<object> (query::gender == object::gender::female));
result r5 (db->query<object> (query::scale == object::scale::ten));
result r6 (db->query<object> (query::yesno == object::yesno::yes));
@@ -73,7 +72,6 @@ main (int argc, char* argv[])
assert (!r4.empty ());
assert (!r5.empty ());
assert (!r6.empty ());
-#endif
t.commit ();
}
diff --git a/common/enum/makefile b/common/enum/makefile
deleted file mode 100644
index d5957fa..0000000
--- a/common/enum/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file : common/enum/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 enum_
-$(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/enum/test.hxx b/common/enum/test.hxx
index 0391581..a279112 100644
--- a/common/enum/test.hxx
+++ b/common/enum/test.hxx
@@ -5,7 +5,6 @@
#define TEST_HXX
#include <odb/core.hxx>
-#include <common/config.hxx> // HAVE_CXX11_ENUM
enum color {red, green, blue};
@@ -23,7 +22,6 @@ struct object
position position_;
-#ifdef HAVE_CXX11_ENUM
enum class gender {male, female};
enum class scale: unsigned char {one = 1, ten = 10, hundred = 100};
enum class yesno: bool {no, yes};
@@ -31,8 +29,6 @@ struct object
gender gender_;
scale scale_;
yesno yesno_;
-#endif
-
};
inline bool
@@ -43,12 +39,9 @@ operator == (const object& x, const object& y)
&& x.color_ == y.color_
&& x.taste_ == y.taste_
&& x.position_ == y.position_
-#ifdef HAVE_CXX11_ENUM
&& x.gender_ == y.gender_
&& x.scale_ == y.scale_
&& x.yesno_ == y.yesno_;
-#endif
- ;
}
#endif // TEST_HXX
diff --git a/common/enum/test.std b/common/enum/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/enum/test.std
+++ /dev/null
diff --git a/common/enum/testscript b/common/enum/testscript
new file mode 100644
index 0000000..d2ca28c
--- /dev/null
+++ b/common/enum/testscript
@@ -0,0 +1,33 @@
+# file : common/enum/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;
+ $*
+}