aboutsummaryrefslogtreecommitdiff
path: root/common/auto
diff options
context:
space:
mode:
Diffstat (limited to 'common/auto')
-rw-r--r--common/auto/driver.cxx95
-rw-r--r--common/auto/makefile117
-rw-r--r--common/auto/test.hxx41
-rw-r--r--common/auto/test.std0
4 files changed, 0 insertions, 253 deletions
diff --git a/common/auto/driver.cxx b/common/auto/driver.cxx
deleted file mode 100644
index 9033a01..0000000
--- a/common/auto/driver.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-// file : common/auto/driver.cxx
-// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-// Test automatic id assignment.
-//
-
-#include <memory> // std::auto_ptr
-#include <cassert>
-#include <iostream>
-
-#include <odb/database.hxx>
-#include <odb/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));
-
- // object
- //
- {
- unsigned long id1, id2, id3;
- {
- object o1 ("one");
- object o2 ("two");
- object o3 ("three");
-
- transaction t (db->begin ());
- db->persist (o1);
- db->persist (o2);
- db->persist (o3);
- t.commit ();
-
- id1 = o1.id_;
- id2 = o2.id_;
- id3 = o3.id_;
-
- assert (id1 != id2);
- assert (id1 != id3);
- assert (id2 != id3);
- }
-
- {
- transaction t (db->begin ());
- auto_ptr<object> o1 (db->load<object> (id1));
- auto_ptr<object> o2 (db->load<object> (id2));
- auto_ptr<object> o3 (db->load<object> (id3));
- t.commit ();
-
- assert (o1->id_ == id1 && o1->str_ == "one");
- assert (o2->id_ == id2 && o2->str_ == "two");
- assert (o3->id_ == id3 && o3->str_ == "three");
- }
- }
-
- // auto_only
- //
- {
- unsigned short id;
- {
- auto_only o;
-
- transaction t (db->begin ());
- db->persist (o);
- t.commit ();
-
- id = o.id_;
- }
-
- {
- transaction t (db->begin ());
- auto_ptr<auto_only> o (db->load<auto_only> (id));
- t.commit ();
-
- assert (o->id_ == id);
- }
- }
- }
- catch (const odb::exception& e)
- {
- cerr << e.what () << endl;
- return 1;
- }
-}
diff --git a/common/auto/makefile b/common/auto/makefile
deleted file mode 100644
index a8562c2..0000000
--- a/common/auto/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file : common/auto/makefile
-# copyright : Copyright (c) 2009-2015 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
-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 auto_
-$(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/auto/test.hxx b/common/auto/test.hxx
deleted file mode 100644
index 0052bee..0000000
--- a/common/auto/test.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-// file : common/auto/test.hxx
-// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST_HXX
-#define TEST_HXX
-
-#include <string>
-
-#include <odb/core.hxx>
-
-#pragma db object
-struct object
-{
- object (const std::string& str)
- : id_ (1), str_ (str)
- {
- }
-
- #pragma db auto id
- unsigned long id_;
- std::string str_;
-
-private:
- object ()
- {
- }
-
- friend class odb::access;
-};
-
-// Test the case where the object has just the auto id.
-//
-#pragma db object
-struct auto_only
-{
- #pragma db auto id pgsql:type("BIGINT")
- unsigned short id_;
-};
-
-#endif // TEST_HXX
diff --git a/common/auto/test.std b/common/auto/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/auto/test.std
+++ /dev/null