diff options
| -rw-r--r-- | boost/makefile | 2 | ||||
| -rw-r--r-- | boost/oracle/date-time/driver.cxx | 134 | ||||
| -rw-r--r-- | boost/oracle/date-time/makefile | 121 | ||||
| -rw-r--r-- | boost/oracle/date-time/test.hxx | 41 | ||||
| -rw-r--r-- | boost/oracle/date-time/test.std | 0 | ||||
| -rw-r--r-- | boost/oracle/makefile | 36 | ||||
| -rw-r--r-- | boost/oracle/template/driver.cxx | 44 | ||||
| -rw-r--r-- | boost/oracle/template/makefile | 116 | ||||
| -rw-r--r-- | boost/oracle/template/test.hxx | 27 | ||||
| -rw-r--r-- | boost/oracle/template/test.std | 1 | ||||
| -rw-r--r-- | makefile | 4 |
11 files changed, 524 insertions, 2 deletions
diff --git a/boost/makefile b/boost/makefile index 4bb2793..9b9a25c 100644 --- a/boost/makefile +++ b/boost/makefile @@ -10,6 +10,8 @@ dirs := common ifeq ($(db_id),mysql) dirs += mysql +else ifeq ($(db_id),oracle) +dirs += oracle else ifeq ($(db_id),sqlite) dirs += sqlite else ifeq ($(db_id),pgsql) diff --git a/boost/oracle/date-time/driver.cxx b/boost/oracle/date-time/driver.cxx new file mode 100644 index 0000000..4bb3058 --- /dev/null +++ b/boost/oracle/date-time/driver.cxx @@ -0,0 +1,134 @@ +// file : boost/oracle/date-time/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 date/time type persistence. Oracle version. +// + +#include <memory> // std::auto_ptr +#include <cassert> +#include <iostream> + +#include <odb/boost/date-time/exceptions.hxx> + +#include <odb/oracle/database.hxx> +#include <odb/oracle/transaction.hxx> + +#include <common/common.hxx> + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; + +using namespace boost::gregorian; +using namespace boost::posix_time; + +using namespace odb::core; + +bool +test_invalid_special_value (object&, auto_ptr<database>&); + +bool +test_out_of_range_value (object&, auto_ptr<database>&); + +int +main (int argc, char* argv[]) +{ + try + { + auto_ptr<database> db (create_database (argc, argv)); + + object o; + + // Test all valid date-time mappings. + // + o.dates.push_back (day_clock::local_day ()); + o.dates.push_back (date (not_a_date_time)); + o.dates.push_back (date (max_date_time)); + o.dates.push_back (date (min_date_time)); + + o.times.push_back (second_clock::local_time ()); + o.times.push_back (not_a_date_time); + o.times.push_back (min_date_time); + o.times.push_back (ptime (max_date_time)); + + o.durations.push_back (time_duration (1, 2, 3)); + o.durations.push_back (time_duration (-1, 2, 3)); + o.durations.push_back (not_a_date_time); + + { + transaction t (db->begin ()); + db->persist (o); + t.commit (); + } + + { + transaction t (db->begin ()); + auto_ptr<object> ol (db->load<object> (o.id)); + t.commit (); + + assert (*ol == o); + } + + { + // Test invalid date mappings. + // + object sv1, sv2; + sv1.dates.push_back (date (neg_infin)); + sv2.dates.push_back (date (pos_infin)); + + transaction t (db->begin ()); + assert (test_invalid_special_value (sv1, db)); + assert (test_invalid_special_value (sv2, db)); + t.commit (); + } + + { + // Test invalid ptime mappings. + // + object sv1, sv2; + sv1.times.push_back (neg_infin); + sv2.times.push_back (pos_infin); + + transaction t (db->begin ()); + assert (test_invalid_special_value (sv1, db)); + assert (test_invalid_special_value (sv2, db)); + t.commit (); + } + + { + // Test invalid time_duration mappings. + // + object sv1, sv2; + sv1.durations.push_back (pos_infin); + sv2.durations.push_back (neg_infin); + + transaction t (db->begin ()); + assert (test_invalid_special_value (sv1, db)); + assert (test_invalid_special_value (sv2, db)); + t.commit (); + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} + +bool +test_invalid_special_value (object& x, auto_ptr<database>& db) +{ + try + { + db->persist (x); + return false; + } + catch (const odb::boost::date_time::special_value&) + { + } + + return true; +} diff --git a/boost/oracle/date-time/makefile b/boost/oracle/date-time/makefile new file mode 100644 index 0000000..059582c --- /dev/null +++ b/boost/oracle/date-time/makefile @@ -0,0 +1,121 @@ +# file : boost/oracle/date-time/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) + +$(call import,\ + $(scf_root)/import/libboost/date-time/stub.make,\ + l: boost_date_time.l) + +# Build. +# +$(driver): $(cxx_obj) $(odb_boost.l) $(common.l) $(boost_date_time.l) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_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 oracle \ +--profile boost/date-time --generate-schema \ +--table-prefix date_time_ +$(gen): cpp_options := -I$(src_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 +# +$(dist): sources := $(cxx_tun) +$(dist): headers := $(odb_hdr) +$(dist): data_dist := test.std +$(dist): export name := $(subst /,-,$(subst $(src_root)/boost/oracle/,,$(src_base))) +$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(dist): + $(call dist-data,$(sources) $(headers) $(data_dist)) + $(call meta-automake,../template/Makefile.am) + $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) + $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) + +# 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,$(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/oracle/date-time/test.hxx b/boost/oracle/date-time/test.hxx new file mode 100644 index 0000000..ef5455a --- /dev/null +++ b/boost/oracle/date-time/test.hxx @@ -0,0 +1,41 @@ +// file : boost/oracle/date-time/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 <boost/date_time/gregorian/gregorian_types.hpp> +#include <boost/date_time/posix_time/posix_time_types.hpp> + +#include <odb/core.hxx> + +#pragma db object +struct object +{ + object () + { + } + + bool + operator== (const object& x) const + { + return + id == x.id && + dates == x.dates && + times == x.times && + durations == x.durations; + } + + #pragma db id auto + unsigned long id; + + std::vector<boost::gregorian::date> dates; + std::vector<boost::posix_time::ptime> times; + std::vector<boost::posix_time::time_duration> durations; +}; + +#endif // TEST_HXX diff --git a/boost/oracle/date-time/test.std b/boost/oracle/date-time/test.std new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/boost/oracle/date-time/test.std diff --git a/boost/oracle/makefile b/boost/oracle/makefile new file mode 100644 index 0000000..929fa8b --- /dev/null +++ b/boost/oracle/makefile @@ -0,0 +1,36 @@ +# file : boost/oracle/makefile +# author : Boris Kolpackov <boris@codesynthesis.com> +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL; see accompanying LICENSE file + +include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make + +tests := \ +date-time \ +template + +default := $(out_base)/ +dist := $(out_base)/.dist +test := $(out_base)/.test +clean := $(out_base)/.clean + +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) + +$(dist): name := boost-oracle +$(dist): export dirs := $(tests) +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) + $(call meta-automake) + $(call meta-vc9sln,$(name)-vc9.sln) + $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vctest,$(name)-vc10.sln,test.bat) + +$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) + +$(call include,$(bld_root)/meta/vc9sln.make) +$(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vctest.make) +$(call include,$(bld_root)/meta/automake.make) + +$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/boost/oracle/template/driver.cxx b/boost/oracle/template/driver.cxx new file mode 100644 index 0000000..b1442e0 --- /dev/null +++ b/boost/oracle/template/driver.cxx @@ -0,0 +1,44 @@ +// file : boost/oracle/template/driver.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// PLACE TEST DESCRIPTION HERE +// + +#include <memory> // std::auto_ptr +#include <cassert> +#include <iostream> + +#include <odb/oracle/database.hxx> +#include <odb/oracle/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)); + + // + // + cout << "test 001" << endl; + { + transaction t (db->begin ()); + t.commit (); + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} diff --git a/boost/oracle/template/makefile b/boost/oracle/template/makefile new file mode 100644 index 0000000..551cfb0 --- /dev/null +++ b/boost/oracle/template/makefile @@ -0,0 +1,116 @@ +# file : boost/oracle/template/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) -I$(src_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 oracle --profile boost \ +--generate-schema --table-prefix boost_oracle_template_ #@@ CHANGE THIS +$(gen): cpp_options := -I$(src_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 +# +$(dist): sources := $(cxx_tun) +$(dist): headers := $(odb_hdr) +$(dist): data_dist := test.std +$(dist): export name := $(subst /,-,$(subst $(src_root)/boost/oracle/,,$(src_base))) +$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(dist): + $(call dist-data,$(sources) $(headers) $(data_dist)) + $(call meta-automake,../template/Makefile.am) + $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) + $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) + +# 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,$(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/oracle/template/test.hxx b/boost/oracle/template/test.hxx new file mode 100644 index 0000000..2bb9244 --- /dev/null +++ b/boost/oracle/template/test.hxx @@ -0,0 +1,27 @@ +// file : boost/oracle/template/test.hxx +// author : Boris Kolpackov <boris@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 <odb/core.hxx> + +#pragma db object +struct object +{ + object (unsigned long id) + : id_ (id) + { + } + + object () + { + } + + #pragma db id + unsigned long id_; +}; + +#endif // TEST_HXX diff --git a/boost/oracle/template/test.std b/boost/oracle/template/test.std new file mode 100644 index 0000000..af8d8e7 --- /dev/null +++ b/boost/oracle/template/test.std @@ -0,0 +1 @@ +test 001 @@ -23,8 +23,8 @@ endif # @@ Remove overrides when Oracle implementation is complete. # ifeq ($(db_id),oracle) -all_dirs := libcommon common tracer mysql sqlite oracle -dirs := common tracer oracle +all_dirs := libcommon common tracer mysql sqlite pgsql oracle boost +dirs := common tracer boost oracle endif default := $(out_base)/ |