Add support for readonly members

New pragma: readonly. New test: readonly.

5 files changed, 504 insertions, 0 deletions

diff --git a/common/makefile b/common/makefile
index ce73bd5..547e764 100644
--- a/common/makefile
+++ b/common/makefile
@@ -20,6 +20,7 @@ inverse             \
 lazy-ptr            \
 lifecycle           \
 query               \
+readonly            \
 relationship        \
 relationship-query  \
 schema              \
@@ -37,6 +38,7 @@ auto               \
 container          \
 lazy-ptr           \
 lifecycle          \
+readonly           \
 schema             \
 wrapper
 
diff --git a/common/readonly/driver.cxx b/common/readonly/driver.cxx
new file mode 100644
index 0000000..2ad40a1
--- /dev/null
+++ b/common/readonly/driver.cxx
@@ -0,0 +1,230 @@
+// file      : common/readonly/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
+
+// Test readonly members/objects.
+//
+
+#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));
+
+    // Simple.
+    //
+    {
+      simple o (1, 1);
+
+      {
+        transaction t (db->begin ());
+        db->persist (o);
+        t.commit ();
+      }
+
+      o.ro++;
+      // const_cast<unsigned long&> (o.co)++;
+      o.rw++;
+
+      {
+        transaction t (db->begin ());
+        db->update (o);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        db->load<simple> (1, o);
+        t.commit ();
+      }
+
+      assert (o.ro == 1 && /*o.co == 1 &&*/ o.rw == 2);
+    }
+
+    // Pointer.
+    //
+    {
+      pointer p (1, new pointer (2));
+      auto_ptr<pointer> p1 (new pointer (3));
+
+      {
+        transaction t (db->begin ());
+        db->persist (p);
+        db->persist (p.ro);
+        db->persist (*p1);
+        t.commit ();
+      }
+
+      delete p.ro;
+      p.ro = p1.release ();
+      p.rw = p.ro;
+
+      {
+        transaction t (db->begin ());
+        db->update (p);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        auto_ptr<pointer> p (db->load<pointer> (1));
+        t.commit ();
+
+        assert (p->ro->id == 2 && p->rw->id == 3);
+      }
+    }
+
+    // Composite.
+    //
+    {
+      composite o (1, 1);
+
+      {
+        transaction t (db->begin ());
+        db->persist (o);
+        t.commit ();
+      }
+
+      o.ro.v++;
+      o.ro.ro++;
+      o.ro.rw++;
+
+      o.rw.v++;
+      o.rw.ro++;
+      o.rw.rw++;
+
+      o.v.v++;
+
+      {
+        transaction t (db->begin ());
+        db->update (o);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        db->load<composite> (1, o);
+        t.commit ();
+      }
+
+      assert (o.ro.v  == 1 &&
+              o.ro.ro == 1 &&
+              o.ro.rw == 1 &&
+
+              o.rw.v  == 1 &&
+              o.rw.ro == 1 &&
+              o.rw.rw == 2 &&
+
+              o.v.v   == 1);
+    }
+
+    // Container.
+    //
+    {
+      container o (1);
+
+      o.ro.push_back (1);
+      o.ro.push_back (2);
+
+      o.rw.push_back (1);
+      o.rw.push_back (2);
+
+      {
+        transaction t (db->begin ());
+        db->persist (o);
+        t.commit ();
+      }
+
+      o.ro[0]++;
+      o.ro.pop_back ();
+
+      o.rw[0]++;
+      o.rw.pop_back ();
+
+      {
+        transaction t (db->begin ());
+        db->update (o);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        db->load<container> (1, o);
+        t.commit ();
+      }
+
+      assert (o.ro.size () == 2 && o.ro[0] == 1 && o.ro[1] == 2 &&
+              o.rw.size () == 1 && o.rw[0] == 2);
+    }
+
+    // Readonly object.
+    //
+    {
+      typedef odb::object_traits<ro_object> ro_traits;
+      typedef odb::object_traits<rw_object> rw_traits;
+
+      assert (ro_traits::column_count ==
+              ro_traits::id_column_count + ro_traits::readonly_column_count);
+
+      assert (rw_traits::column_count !=
+              rw_traits::id_column_count + rw_traits::readonly_column_count);
+
+      ro_object ro_o (1, 1);
+      rw_object rw_o (1, 1);
+
+      ro_o.cr.push_back (1);
+      ro_o.cr.push_back (2);
+
+      rw_o.cr.push_back (1);
+      rw_o.cr.push_back (2);
+
+      {
+        transaction t (db->begin ());
+        db->persist (ro_o);
+        db->persist (rw_o);
+        t.commit ();
+      }
+
+      rw_o.sv++;
+      rw_o.rw_sv++;
+
+      {
+        transaction t (db->begin ());
+        //db->update (ro_o); // Compile error.
+        db->update (rw_o);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        db->load<ro_object> (1, ro_o);
+        db->load<ro_object> (1, rw_o);
+        t.commit ();
+      }
+
+      assert (rw_o.sv == 1 && rw_o.rw_sv == 2);
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/common/readonly/makefile b/common/readonly/makefile
new file mode 100644
index 0000000..d8fd474
--- /dev/null
+++ b/common/readonly/makefile
@@ -0,0 +1,109 @@
+# file      : common/readonly/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)
+
+# 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 \
+--table-prefix readonly_
+$(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))
+$(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))
+
+# 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/common/readonly/test.hxx b/common/readonly/test.hxx
new file mode 100644
index 0000000..a4cc55b
--- /dev/null
+++ b/common/readonly/test.hxx
@@ -0,0 +1,163 @@
+// file      : common/readonly/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 <vector>
+
+#include <odb/core.hxx>
+
+// Simple readonly value.
+//
+#pragma db object
+struct simple
+{
+  simple (unsigned long i, unsigned long x)
+      : id (i), ro (x), /*co (x),*/ rw (x)
+  {
+  }
+
+  simple ()/*: co (0)*/ {}
+
+  #pragma db id
+  unsigned long id;
+
+  #pragma db readonly
+  unsigned long ro;
+
+  //const unsigned long co;
+
+  unsigned long rw;
+};
+
+// Readonly pointer.
+//
+#pragma db object
+struct pointer
+{
+  pointer (unsigned long i, pointer* p = 0): id (i), ro (p), rw (p) {}
+  pointer (): ro (0), rw (0) {}
+
+  ~pointer ()
+  {
+    delete ro;
+
+    if (ro != rw)
+      delete rw;
+  }
+
+  #pragma db id
+  unsigned long id;
+
+  #pragma db readonly
+  pointer* ro;
+
+  pointer* rw;
+};
+
+// Composite readonly value as well as simple readonly value inside
+// a composite.
+//
+#pragma db value readonly
+struct ro_value
+{
+  ro_value () {}
+  ro_value (unsigned long x): v (x) {}
+
+  unsigned long v;
+};
+
+#pragma db value
+struct value: ro_value
+{
+  value () {}
+  value (unsigned long x): ro_value (x), ro (x), rw (x) {}
+
+  #pragma db readonly
+  unsigned long ro;
+
+  unsigned long rw;
+};
+
+#pragma db object
+struct composite
+{
+  composite (unsigned long i, unsigned long x)
+      : id (i), ro (x), rw (x), v (x)
+  {
+  }
+
+  composite () {}
+
+  #pragma db id
+  unsigned long id;
+
+  #pragma db readonly
+  value ro;
+
+  value rw;
+  ro_value v;
+};
+
+// Readonly container.
+//
+#pragma db object
+struct container
+{
+  container (unsigned long i): id (i) {}
+  container () {}
+
+  #pragma db id
+  unsigned long id;
+
+  #pragma db readonly
+  std::vector<unsigned long> ro;
+
+  std::vector<unsigned long> rw;
+};
+
+// Readonly object.
+//
+#pragma db object
+struct object
+{
+  object (unsigned long i, unsigned long x): id (i), sv (x) {}
+  object () {}
+
+  #pragma db id
+  unsigned long id;
+
+  unsigned long sv;
+};
+
+#pragma db object readonly
+struct ro_object: object
+{
+  ro_object (unsigned long i, unsigned long x)
+      : object (i, x), cv (x)
+  {
+  }
+
+  ro_object () {}
+
+  value cv;
+  std::vector<unsigned long> cr;
+};
+
+#pragma db object
+struct rw_object: ro_object
+{
+  rw_object (unsigned long i, unsigned long x)
+      : ro_object (i, x), rw_sv (x)
+  {
+  }
+
+  rw_object () {}
+
+  unsigned long rw_sv;
+};
+
+#endif // TEST_HXX
diff --git a/common/readonly/test.std b/common/readonly/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/readonly/test.std