From 9bd664e4cb39f6654e8754c8cfd4c28295ee2d90 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 8 Jan 2013 10:37:05 +0200 Subject: Rename common/session to common/session/cache --- common/makefile | 2 +- common/session/cache/driver.cxx | 84 +++++++++++++++++++++++++++++ common/session/cache/makefile | 115 ++++++++++++++++++++++++++++++++++++++++ common/session/cache/test.hxx | 66 +++++++++++++++++++++++ common/session/cache/test.std | 0 common/session/driver.cxx | 84 ----------------------------- common/session/makefile | 115 ---------------------------------------- common/session/test.hxx | 66 ----------------------- common/session/test.std | 0 9 files changed, 266 insertions(+), 266 deletions(-) create mode 100644 common/session/cache/driver.cxx create mode 100644 common/session/cache/makefile create mode 100644 common/session/cache/test.hxx create mode 100644 common/session/cache/test.std delete mode 100644 common/session/driver.cxx delete mode 100644 common/session/makefile delete mode 100644 common/session/test.hxx delete mode 100644 common/session/test.std diff --git a/common/makefile b/common/makefile index 1de430d..decfcd8 100644 --- a/common/makefile +++ b/common/makefile @@ -38,7 +38,7 @@ readonly \ relationship \ relationship-query \ schema \ -session \ +session/cache \ template \ transaction \ types \ diff --git a/common/session/cache/driver.cxx b/common/session/cache/driver.cxx new file mode 100644 index 0000000..9487afa --- /dev/null +++ b/common/session/cache/driver.cxx @@ -0,0 +1,84 @@ +// file : common/session/cache/driver.cxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test session object cache. +// + +#include // std::auto_ptr +#include +#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)); + + // Test the session_required exception. + // +#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY) + { + using namespace test1; + + shared_ptr o1a (new obj1 (1)); + shared_ptr o1b (new obj1 (2)); + shared_ptr o2 (new obj2 (1)); + + o1a->o2 = o2; + o1b->o2 = o2; + + o2->o1.push_back (o1a); + o2->o1.push_back (o1b); + + { + transaction t (db->begin ()); + db->persist (o1a); + db->persist (o1b); + db->persist (o2); + t.commit (); + } + + { + transaction t (db->begin ()); + + try + { + shared_ptr o1 (db->load (1)); + assert (false); + } + catch (const session_required&) + { + } + + t.commit (); + } + + { + session s; + transaction t (db->begin ()); + shared_ptr o1 (db->load (1)); + t.commit (); + } + } +#endif + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} diff --git a/common/session/cache/makefile b/common/session/cache/makefile new file mode 100644 index 0000000..cbbf600 --- /dev/null +++ b/common/session/cache/makefile @@ -0,0 +1,115 @@ +# file : common/session/cache/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 +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 := $(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) --generate-schema \ +--generate-session --table-prefix session_cache_ +$(gen): cpp_options := -I$(src_base) +$(gen): $(common.l.cpp-options) + +$(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)) $(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 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/vc11proj.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/session/cache/test.hxx b/common/session/cache/test.hxx new file mode 100644 index 0000000..ff59249 --- /dev/null +++ b/common/session/cache/test.hxx @@ -0,0 +1,66 @@ +// file : common/session/cache/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 + +#include // HAVE_CXX11, HAVE_TR1_MEMORY + +#include +#include + +#include + +#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY) +# include +#endif + +// Test the session_required exception. +// +#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY) + +#pragma db namespace table("t1_") +namespace test1 +{ +#ifdef HAVE_CXX11 + using std::shared_ptr; + using std::weak_ptr; +#else + using std::tr1::shared_ptr; + using std::tr1::weak_ptr; +#endif + + #pragma db namespace(test1) pointer(shared_ptr) + + struct obj2; + + #pragma db object + struct obj1 + { + obj1 () {} + obj1 (unsigned long id): id_ (id) {} + + #pragma db id + unsigned long id_; + + shared_ptr o2; + }; + + #pragma db object + struct obj2 + { + obj2 () {} + obj2 (unsigned long id): id_ (id) {} + + #pragma db id + unsigned long id_; + + #pragma db inverse (o2) + std::vector< weak_ptr > o1; + }; +} + +#endif // HAVE_CXX11 || HAVE_TR1_MEMORY + +#endif // TEST_HXX diff --git a/common/session/cache/test.std b/common/session/cache/test.std new file mode 100644 index 0000000..e69de29 diff --git a/common/session/driver.cxx b/common/session/driver.cxx deleted file mode 100644 index 232aee6..0000000 --- a/common/session/driver.cxx +++ /dev/null @@ -1,84 +0,0 @@ -// file : common/session/driver.cxx -// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC -// license : GNU GPL v2; see accompanying LICENSE file - -// Test session. -// - -#include // std::auto_ptr -#include -#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)); - - // Test the session_required exception. - // -#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY) - { - using namespace test1; - - shared_ptr o1a (new obj1 (1)); - shared_ptr o1b (new obj1 (2)); - shared_ptr o2 (new obj2 (1)); - - o1a->o2 = o2; - o1b->o2 = o2; - - o2->o1.push_back (o1a); - o2->o1.push_back (o1b); - - { - transaction t (db->begin ()); - db->persist (o1a); - db->persist (o1b); - db->persist (o2); - t.commit (); - } - - { - transaction t (db->begin ()); - - try - { - shared_ptr o1 (db->load (1)); - assert (false); - } - catch (const session_required&) - { - } - - t.commit (); - } - - { - session s; - transaction t (db->begin ()); - shared_ptr o1 (db->load (1)); - t.commit (); - } - } -#endif - } - catch (const odb::exception& e) - { - cerr << e.what () << endl; - return 1; - } -} diff --git a/common/session/makefile b/common/session/makefile deleted file mode 100644 index 7da6d42..0000000 --- a/common/session/makefile +++ /dev/null @@ -1,115 +0,0 @@ -# file : common/session/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 -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 := $(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) --generate-schema \ ---generate-session --table-prefix session_ -$(gen): cpp_options := -I$(src_base) -$(gen): $(common.l.cpp-options) - -$(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)) $(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 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/vc11proj.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/session/test.hxx b/common/session/test.hxx deleted file mode 100644 index abc4628..0000000 --- a/common/session/test.hxx +++ /dev/null @@ -1,66 +0,0 @@ -// file : common/session/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 - -#include // HAVE_CXX11, HAVE_TR1_MEMORY - -#include -#include - -#include - -#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY) -# include -#endif - -// Test the session_required exception. -// -#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY) - -#pragma db namespace table("t1_") -namespace test1 -{ -#ifdef HAVE_CXX11 - using std::shared_ptr; - using std::weak_ptr; -#else - using std::tr1::shared_ptr; - using std::tr1::weak_ptr; -#endif - - #pragma db namespace(test1) pointer(shared_ptr) - - struct obj2; - - #pragma db object - struct obj1 - { - obj1 () {} - obj1 (unsigned long id): id_ (id) {} - - #pragma db id - unsigned long id_; - - shared_ptr o2; - }; - - #pragma db object - struct obj2 - { - obj2 () {} - obj2 (unsigned long id): id_ (id) {} - - #pragma db id - unsigned long id_; - - #pragma db inverse (o2) - std::vector< weak_ptr > o1; - }; -} - -#endif // HAVE_CXX11 || HAVE_TR1_MEMORY - -#endif // TEST_HXX diff --git a/common/session/test.std b/common/session/test.std deleted file mode 100644 index e69de29..0000000 -- cgit v1.1