From 54f820b0d4a1cb614753c333bd78feb9ed579aad Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 31 Jul 2012 12:16:55 +0200 Subject: Add support for changing location that ODB views as class definition This is useful for making third-party/system types into ODB composite value types. New pragma: definition. New test: common/definition. --- common/definition/driver.cxx | 55 +++++++++++++++++ common/definition/makefile | 117 +++++++++++++++++++++++++++++++++++++ common/definition/test.hxx | 27 +++++++++ common/definition/test.std | 0 common/definition/time-mapping.hxx | 18 ++++++ common/makefile | 1 + 6 files changed, 218 insertions(+) create mode 100644 common/definition/driver.cxx create mode 100644 common/definition/makefile create mode 100644 common/definition/test.hxx create mode 100644 common/definition/test.std create mode 100644 common/definition/time-mapping.hxx diff --git a/common/definition/driver.cxx b/common/definition/driver.cxx new file mode 100644 index 0000000..d23b9e2 --- /dev/null +++ b/common/definition/driver.cxx @@ -0,0 +1,55 @@ +// file : common/definition/driver.cxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test overriding composite value definition point. This is primarily +// useful to make composite values out of third-party types. +// + +#include // std::auto_ptr +#include +#include + +#include +#include + +#include + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; +using namespace odb::core; + +int +main (int argc, char* argv[]) +{ + try + { + auto_ptr db (create_database (argc, argv)); + + object o; + o.time.tv_sec = 1; + o.time.tv_usec = 1000; + + { + transaction t (db->begin ()); + db->persist (o); + t.commit (); + } + + { + transaction t (db->begin ()); + auto_ptr p (db->load (o.id)); + t.commit (); + + assert (p->time.tv_sec == o.time.tv_sec && + p->time.tv_usec == o.time.tv_usec); + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} diff --git a/common/definition/makefile b/common/definition/makefile new file mode 100644 index 0000000..fb64b71 --- /dev/null +++ b/common/definition/makefile @@ -0,0 +1,117 @@ +# file : common/definition/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 +odb_hdr := test.hxx time-mapping.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) + +# 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) + +genf := $(foreach f,$(odb_hdr:.hxx=),$(addprefix $f,-odb.hxx -odb.ixx -odb.cxx .sql)) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ +--table-prefix definition_ +$(gen): cpp_options := -I$(src_base) +$(gen): $(common.l.cpp-options) + +# Extra dependecy for the ODB-generated code. +# +$(gen): $(src_base)/time-mapping.hxx + +$(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): 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 schema) + $(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,$(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/definition/test.hxx b/common/definition/test.hxx new file mode 100644 index 0000000..51a5029 --- /dev/null +++ b/common/definition/test.hxx @@ -0,0 +1,27 @@ +// file : common/definition/test.hxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TEST_HXX +#define TEST_HXX + +#ifdef _WIN32 +# include // timeval +#else +# include // timeval +#endif + +#include + +#include "time-mapping.hxx" + +#pragma db object +struct object +{ + #pragma db id auto + unsigned long id; + + timeval time; +}; + +#endif // TEST_HXX diff --git a/common/definition/test.std b/common/definition/test.std new file mode 100644 index 0000000..e69de29 diff --git a/common/definition/time-mapping.hxx b/common/definition/time-mapping.hxx new file mode 100644 index 0000000..d55159d --- /dev/null +++ b/common/definition/time-mapping.hxx @@ -0,0 +1,18 @@ +// file : common/definition/time-mapping.hxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TIME_MAPPING_HXX +#define TIME_MAPPING_HXX + +#ifdef _WIN32 +# include // timeval +#else +# include // timeval +#endif + +#pragma db value(timeval) definition +#pragma db member(timeval::tv_sec) column("sec") +#pragma db member(timeval::tv_usec) column("usec") + +#endif // TIME_MAPPING_HXX diff --git a/common/makefile b/common/makefile index 464466a..e1a5f13 100644 --- a/common/makefile +++ b/common/makefile @@ -17,6 +17,7 @@ const-member \ container \ ctor \ default \ +definition \ enum \ erase-query \ include \ -- cgit v1.1