Implement on_delete pragma for object pointers

Translates to the ON DELETE SQL clause.

4 files changed, 0 insertions, 439 deletions

diff --git a/common/relationship-query/driver.cxx b/common/relationship-query/driver.cxx
deleted file mode 100644
index 785aa94..0000000
--- a/common/relationship-query/driver.cxx
+++ /dev/null
@@ -1,173 +0,0 @@
-// file      : common/relationship-query/driver.cxx
-// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-// Test relationship queries.
-//
-
-#include <memory>   // std::auto_ptr
-#include <cassert>
-#include <iostream>
-
-#include <odb/database.hxx>
-#include <odb/session.hxx>
-#include <odb/transaction.hxx>
-
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-#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));
-
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
-
-    //
-    //
-    {
-      shared_ptr<country> ca (new country ("CA", "Canada"));
-      shared_ptr<country> za (new country ("ZA", "South Africa"));
-      shared_ptr<country> us (new country ("US", "United States"));
-      shared_ptr<country> se (new country ("SE", "Sweden"));
-
-      shared_ptr<employer> st (new employer ("Simple Tech, Inc", ca));
-      shared_ptr<employer> ct (new employer ("Complex Tech, Inc", us));
-
-      // person
-      //
-      shared_ptr<person> p1 (
-        new person (1, "John", "Doe", 30, ca, true, za));
-
-      shared_ptr<person> p2 (
-        new person (2, "Jane", "Doe", 29, za, false, us));
-      p2->husband = p1;
-
-      shared_ptr<person> p3 (
-        new person (3, "Joe", "Dirt", 31,  us, true, us));
-
-      shared_ptr<person> p4 (
-        new person (4, "Johan", "Johansen", 32, se, false, ca));
-
-      // employee
-      //
-      shared_ptr<employee> e1 (
-        new employee (1, "John", "Doe", 30, ca, true, za, st));
-
-      shared_ptr<employee> e2 (
-        new employee (2, "Jane", "Doe", 29, za, false, us, ct));
-      e2->husband = p1;
-
-      shared_ptr<employee> e3 (
-        new employee (3, "Joe", "Dirt", 31,  us, true, us, st));
-
-      shared_ptr<employee> e4 (
-        new employee (4, "Johan", "Johansen", 32, se, false, ca, ct));
-
-      transaction t (db->begin ());
-      db->persist (ca);
-      db->persist (za);
-      db->persist (us);
-      db->persist (se);
-
-      db->persist (st);
-      db->persist (ct);
-
-      db->persist (p1);
-      db->persist (p2);
-      db->persist (p3);
-      db->persist (p4);
-
-      db->persist (e1);
-      db->persist (e2);
-      db->persist (e3);
-      db->persist (e4);
-      t.commit ();
-    }
-
-    typedef odb::query<person> p_query;
-    typedef odb::result<person> p_result;
-
-    typedef odb::query<employee> e_query;
-    typedef odb::result<employee> e_result;
-
-    // Make sure we have an independent JOIN for each relationship.
-    //
-    {
-      session s;
-      transaction t (db->begin ());
-
-      p_result pr (db->query<person> (
-                   p_query::residence.location->code == "ZA"));
-      assert (size (pr) == 1);
-
-      e_result er (db->query<employee> (
-                   e_query::residence.location->code == "ZA"));
-      assert (size (er) == 1);
-
-      t.commit ();
-    }
-
-    // Test Self-JOIN.
-    //
-    {
-      session s;
-      transaction t (db->begin ());
-
-      p_result pr (db->query<person> (p_query::husband->last_name == "Doe"));
-      assert (size (pr) == 1);
-
-      e_result er (db->query<employee> (e_query::husband->last_name == "Doe"));
-      assert (size (er) == 1);
-
-      t.commit ();
-    }
-
-    // Test query conditions from both base and derived.
-    //
-    {
-      session s;
-      transaction t (db->begin ());
-
-      e_result r (
-        db->query<employee> (
-          e_query::employed_by->name == "Simple Tech, Inc" &&
-          e_query::nationality->code == "US"));
-
-      assert (size (r) == 1);
-
-      t.commit ();
-    }
-
-    // Test second-level pointers.
-    //
-    {
-      session s;
-      transaction t (db->begin ());
-
-      p_result r (
-        db->query<person> (
-          p_query::husband->residence.location == "CA"));
-
-      assert (size (r) == 1);
-
-      t.commit ();
-    }
-
-#endif // HAVE_CXX11 || HAVE_TR1_MEMORY
-
-  }
-  catch (const odb::exception& e)
-  {
-    cerr << e.what () << endl;
-    return 1;
-  }
-}
diff --git a/common/relationship-query/makefile b/common/relationship-query/makefile
deleted file mode 100644
index 14d5e5c..0000000
--- a/common/relationship-query/makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# file      : common/relationship-query/makefile
-# copyright : Copyright (c) 2009-2013 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 --generate-query \
---generate-session --table-prefix relationship_query_
-$(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))
-$(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))
-
-# 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/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/relationship-query/test.hxx b/common/relationship-query/test.hxx
deleted file mode 100644
index b2f9568..0000000
--- a/common/relationship-query/test.hxx
+++ /dev/null
@@ -1,151 +0,0 @@
-// file      : common/relationship-query/test.hxx
-// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST_HXX
-#define TEST_HXX
-
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
-
-#include <string>
-
-#include <odb/core.hxx>
-
-#ifdef HAVE_CXX11
-#  include <memory>
-using std::shared_ptr;
-#else
-#  include <odb/tr1/memory.hxx>
-using std::tr1::shared_ptr;
-#endif
-
-struct country;
-
-#pragma db value
-struct residence_info
-{
-  residence_info (bool p, shared_ptr<country> l)
-      : permanent (p), location (l)
-  {
-  }
-
-  residence_info ()
-  {
-  }
-
-  bool permanent;
-
-  #pragma db not_null
-  shared_ptr<country> location;
-};
-
-#pragma db object pointer(shared_ptr)
-struct person
-{
-  person (unsigned long i,
-          const std::string& fn,
-          const std::string& ln,
-          unsigned short a,
-          shared_ptr<country> r,
-          bool p,
-          shared_ptr<country> n)
-      : id (i),
-        first_name (fn),
-        last_name (ln),
-        age (a),
-        residence (p, r),
-        nationality (n)
-  {
-  }
-
-  person ()
-  {
-  }
-
-  #pragma db id
-  unsigned long id;
-
-  #pragma db column ("first")
-  std::string first_name;
-
-  #pragma db column ("last")
-  std::string last_name;
-
-  unsigned short age;
-
-  residence_info residence;
-
-  #pragma db not_null
-  shared_ptr<country> nationality;
-
-  shared_ptr<person> husband; // Self-join.
-};
-
-struct employer;
-
-#pragma db object pointer(shared_ptr)
-struct employee: person
-{
-  employee (unsigned long i,
-          const std::string& fn,
-          const std::string& ln,
-          unsigned short a,
-          shared_ptr<country> r,
-          bool p,
-          shared_ptr<country> n,
-          shared_ptr<employer> e)
-      : person (i, fn, ln, a, r, p, n),
-        employed_by (e)
-  {
-  }
-
-  employee ()
-  {
-  }
-
-  shared_ptr<employer> employed_by;
-};
-
-#pragma db object pointer(shared_ptr)
-struct employer
-{
-  employer (const std::string& n, shared_ptr<country> nat)
-      : name (n), nationality (nat)
-  {
-  }
-
-  employer ()
-  {
-  }
-
-  #pragma db id
-  std::string name;
-
-  // The same member name and type as in person (test JOIN alias).
-  //
-  #pragma db not_null
-  shared_ptr<country> nationality;
-};
-
-#pragma db object pointer(shared_ptr)
-struct country
-{
-  country (const std::string& c, std::string const& n)
-      : code (c), name (n)
-  {
-  }
-
-  country ()
-  {
-  }
-
-  #pragma db id
-  std::string code; // ISO 2-letter country code.
-
-  std::string name;
-};
-
-#endif // HAVE_CXX11 || HAVE_TR1_MEMORY
-#endif // TEST_HXX
diff --git a/common/relationship-query/test.std b/common/relationship-query/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/relationship-query/test.std
+++ /dev/null