From 9208de71c16ce8d676f9da1b71020c12384018c9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 8 Feb 2013 18:21:32 +0200 Subject: Add schema_catalog::exists() function --- common/makefile | 1 + common/schema/embedded/basics/driver.cxx | 61 +++++++++++++++++ common/schema/embedded/basics/makefile | 114 +++++++++++++++++++++++++++++++ common/schema/embedded/basics/test.hxx | 24 +++++++ common/schema/embedded/basics/test.std | 0 common/schema/embedded/order/driver.cxx | 2 +- 6 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 common/schema/embedded/basics/driver.cxx create mode 100644 common/schema/embedded/basics/makefile create mode 100644 common/schema/embedded/basics/test.hxx create mode 100644 common/schema/embedded/basics/test.std (limited to 'common') diff --git a/common/makefile b/common/makefile index 551a0f8..502690e 100644 --- a/common/makefile +++ b/common/makefile @@ -40,6 +40,7 @@ readonly \ relationship \ relationship-query \ schema/namespace \ +schema/embedded/basics \ schema/embedded/order \ session/cache \ template \ diff --git a/common/schema/embedded/basics/driver.cxx b/common/schema/embedded/basics/driver.cxx new file mode 100644 index 0000000..2e65b52 --- /dev/null +++ b/common/schema/embedded/basics/driver.cxx @@ -0,0 +1,61 @@ +// file : common/schema/embedded/basics/driver.cxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test basic embedded schema functionality. +// + +#include // std::auto_ptr +#include +#include + +#include +#include +#include + +#include // DATABASE_XXX +#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, false)); + + // 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 + + assert (schema_catalog::exists (*db, "test")); + assert (!schema_catalog::exists (*db, "test1")); + assert (!schema_catalog::exists (*db, "")); + + transaction t (c->begin ()); + schema_catalog::create_schema (*db, "test"); + 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/basics/makefile b/common/schema/embedded/basics/makefile new file mode 100644 index 0000000..d134ba1 --- /dev/null +++ b/common/schema/embedded/basics/makefile @@ -0,0 +1,114 @@ +# file : common/schema/embedded/basics/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 \ +--schema-format embedded --schema-name test --table-prefix schema_embd_bscs_ +$(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 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/embedded/basics/test.hxx b/common/schema/embedded/basics/test.hxx new file mode 100644 index 0000000..99e1aac --- /dev/null +++ b/common/schema/embedded/basics/test.hxx @@ -0,0 +1,24 @@ +// file : common/schema/embedded/basics/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 +#include + +#include + +#pragma db object +struct object +{ + #pragma db auto id + unsigned long id; + + std::string str; + + std::vector nums; +}; + +#endif // TEST_HXX diff --git a/common/schema/embedded/basics/test.std b/common/schema/embedded/basics/test.std new file mode 100644 index 0000000..e69de29 diff --git a/common/schema/embedded/order/driver.cxx b/common/schema/embedded/order/driver.cxx index 7503cf5..78de801 100644 --- a/common/schema/embedded/order/driver.cxx +++ b/common/schema/embedded/order/driver.cxx @@ -30,7 +30,7 @@ main (int argc, char* argv[]) { try { - auto_ptr db (create_database (argc, argv)); + auto_ptr db (create_database (argc, argv, false)); // Create the database schema. // -- cgit v1.1