aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/makefile3
-rw-r--r--common/schema/embedded/order/driver.cxx60
-rw-r--r--common/schema/embedded/order/makefile119
-rw-r--r--common/schema/embedded/order/test.std (renamed from common/schema/test.std)0
-rw-r--r--common/schema/embedded/order/test1.hxx24
-rw-r--r--common/schema/embedded/order/test2.hxx18
-rw-r--r--common/schema/namespace/driver.cxx (renamed from common/schema/driver.cxx)4
-rw-r--r--common/schema/namespace/makefile (renamed from common/schema/makefile)14
-rw-r--r--common/schema/namespace/test.hxx (renamed from common/schema/test.hxx)2
-rw-r--r--common/schema/namespace/test.std0
10 files changed, 233 insertions, 11 deletions
diff --git a/common/makefile b/common/makefile
index 883fe3f..551a0f8 100644
--- a/common/makefile
+++ b/common/makefile
@@ -39,7 +39,8 @@ query/array \
readonly \
relationship \
relationship-query \
-schema \
+schema/namespace \
+schema/embedded/order \
session/cache \
template \
transaction/basics \
diff --git a/common/schema/embedded/order/driver.cxx b/common/schema/embedded/order/driver.cxx
new file mode 100644
index 0000000..7503cf5
--- /dev/null
+++ b/common/schema/embedded/order/driver.cxx
@@ -0,0 +1,60 @@
+// file : common/schema/embedded/order/driver.cxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Test statement execution order in embedded schemas.
+//
+
+#include <memory> // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/schema-catalog.hxx>
+
+#include <common/config.hxx> // DATABASE_XXX
+#include <common/common.hxx>
+
+#include "test1.hxx"
+#include "test2.hxx"
+
+#include "test1-odb.hxx"
+#include "test2-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+ try
+ {
+ auto_ptr<database> db (create_database (argc, argv));
+
+ // Create the database schema.
+ //
+ {
+ connection_ptr c (db->connection ());
+
+ // Temporarily disable foreign key constraints for SQLite.
+ //
+#if defined(DATABASE_SQLITE)
+ c->execute ("PRAGMA foreign_keys=OFF");
+#endif
+
+ transaction t (c->begin ());
+ schema_catalog::create_schema (*db);
+ t.commit ();
+
+#if defined(DATABASE_SQLITE)
+ c->execute ("PRAGMA foreign_keys=ON");
+#endif
+ }
+ }
+ catch (const odb::exception& e)
+ {
+ cerr << e.what () << endl;
+ return 1;
+ }
+}
diff --git a/common/schema/embedded/order/makefile b/common/schema/embedded/order/makefile
new file mode 100644
index 0000000..b706345
--- /dev/null
+++ b/common/schema/embedded/order/makefile
@@ -0,0 +1,119 @@
+# file : common/schema/embedded/order/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 := test2.hxx test1.hxx # Reverse order.
+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 \
+--schema-format embedded --table-prefix schema_embd_ordr_
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+# Extra dependecy for the ODB-generated code.
+#
+$(gen): $(addprefix $(src_base)/,$(odb_hdr))
+
+$(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 odb_header_stem := $(basename $(odb_hdr))
+$(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 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/schema/test.std b/common/schema/embedded/order/test.std
index e69de29..e69de29 100644
--- a/common/schema/test.std
+++ b/common/schema/embedded/order/test.std
diff --git a/common/schema/embedded/order/test1.hxx b/common/schema/embedded/order/test1.hxx
new file mode 100644
index 0000000..d7e0622
--- /dev/null
+++ b/common/schema/embedded/order/test1.hxx
@@ -0,0 +1,24 @@
+// file : common/schema/embedded/order/test1.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST1_HXX
+#define TEST1_HXX
+
+#include <string>
+
+#include <odb/core.hxx>
+
+#pragma db object polymorphic
+struct base
+{
+ virtual
+ ~base () {}
+
+ #pragma db auto id
+ unsigned long id;
+
+ std::string str;
+};
+
+#endif // TEST1_HXX
diff --git a/common/schema/embedded/order/test2.hxx b/common/schema/embedded/order/test2.hxx
new file mode 100644
index 0000000..870ca51
--- /dev/null
+++ b/common/schema/embedded/order/test2.hxx
@@ -0,0 +1,18 @@
+// file : common/schema/embedded/order/test2.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST2_HXX
+#define TEST2_HXX
+
+#include <odb/core.hxx>
+
+#include "test1.hxx"
+
+#pragma db object
+struct derived: base
+{
+ int num;
+};
+
+#endif // TEST2_HXX
diff --git a/common/schema/driver.cxx b/common/schema/namespace/driver.cxx
index a47d1f6..d74461c 100644
--- a/common/schema/driver.cxx
+++ b/common/schema/namespace/driver.cxx
@@ -1,8 +1,8 @@
-// file : common/schema/driver.cxx
+// file : common/schema/namespace/driver.cxx
// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file
-// Test various aspects of database schema.
+// Test database schemas (aka database namespaces).
//
#include <memory> // std::auto_ptr
diff --git a/common/schema/makefile b/common/schema/namespace/makefile
index e7f03df..e15ee10 100644
--- a/common/schema/makefile
+++ b/common/schema/namespace/makefile
@@ -1,8 +1,8 @@
-# file : common/schema/makefile
+# file : common/schema/namespace/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
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
cxx_tun := driver.cxx
odb_hdr := test.hxx
@@ -35,7 +35,7 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---generate-query --table-prefix schema_
+--generate-query --table-prefix schema_ns_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
@@ -58,10 +58,10 @@ $(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))
+ $(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.
#
diff --git a/common/schema/test.hxx b/common/schema/namespace/test.hxx
index 5e30518..44d5c60 100644
--- a/common/schema/test.hxx
+++ b/common/schema/namespace/test.hxx
@@ -1,4 +1,4 @@
-// file : common/schema/test.hxx
+// file : common/schema/namespace/test.hxx
// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file
diff --git a/common/schema/namespace/test.std b/common/schema/namespace/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/schema/namespace/test.std
generated by cgit v1.1 at 2024-11-25 13:07:26 +0000