Handling of dynamic empty statements as result of versioning

11 files changed, 669 insertions, 4 deletions

diff --git a/common/statement/processing/driver.cxx b/common/statement/processing/driver.cxx
index 34def73..99a9be9 100644
--- a/common/statement/processing/driver.cxx
+++ b/common/statement/processing/driver.cxx
@@ -264,7 +264,7 @@ main (int, char* argv[])
                     "SET\n"
                     "[a]=$1\n"
                     "WHERE [id]=$2",
-                    "UPDATE [foo] WHERE [id]=$2",
+                    "",
                     b, 2));
   }
 
@@ -385,6 +385,21 @@ main (int, char* argv[])
   // SELECT
   //
 
+  // Empty.
+  //
+  {
+    void* b[] = {0, 0, 0};
+    assert (select ("SELECT\n"
+                    "[a].[x],\n"
+                    "[t].[y],\n"
+                    "[t].[z]\n"
+                    "FROM [t]\n"
+                    "LEFT JOIN [t1] AS [a] ON [a].[id]=[t].[id]\n"
+                    "WHERE [t].[id]=$1",
+                    "",
+                    b, 3));
+  }
+
   // Fast path.
   //
   {
diff --git a/common/view/test.hxx b/common/view/test.hxx
index f9bc8e8..e543466 100644
--- a/common/view/test.hxx
+++ b/common/view/test.hxx
@@ -394,7 +394,7 @@ struct view6b
 #ifndef ODB_DATABASE_ORACLE
 #  pragma db view table("t_view_person" = "p")                 \
   table("t_view_employer_employees" = "ee": "ee.value = p.id") \
-  table("t_view_employer" = "e": "ee.object_id = e.name")
+  table("t_view_employer" = "e": "\"ee\".\"object_id\" = e.name")
 #else
 #  pragma db view table("t_view_person" = "p")                                \
   table("t_view_employer_employees" = "ee": "\"ee\".\"value\" = \"p\".\"id\"")\
diff --git a/evolution/drop-column/driver.cxx b/evolution/drop-column/driver.cxx
index 099fe0f..4078c58 100644
--- a/evolution/drop-column/driver.cxx
+++ b/evolution/drop-column/driver.cxx
@@ -70,7 +70,7 @@ main (int argc, char* argv[])
       }
     case 2:
       {
-        using namespace v2; // @@ soft delete
+        using namespace v3;
 
         if (embedded)
         {
@@ -108,6 +108,7 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
           auto_ptr<object> p (db->load<object> (1));
+          assert (p->str == "");
           t.commit ();
         }
         break;
diff --git a/evolution/drop-column/model.hxx b/evolution/drop-column/model.hxx
index 42a8f54..feff041 100644
--- a/evolution/drop-column/model.hxx
+++ b/evolution/drop-column/model.hxx
@@ -31,9 +31,18 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
     // SQLite doesn't support dropping of columns.
     //
 #ifndef DATABASE_SQLITE
-#if MODEL_VERSION == 2
+#if MODEL_VERSION >= 2
+
+#if MODEL_VERSION == 3
+    #pragma db deleted(3)
+#endif
     std::string str;
+
+#if MODEL_VERSION == 3
+    #pragma db deleted(3)
+#endif
     unsigned long num;
+
 #endif
 #endif
   };
diff --git a/evolution/makefile b/evolution/makefile
index 0b24422..b58efb2 100644
--- a/evolution/makefile
+++ b/evolution/makefile
@@ -16,6 +16,7 @@ add-index        \
 drop-index       \
 combined         \
 embedded         \
+soft-delete      \
 version          \
 data             \
 template
diff --git a/evolution/soft-delete/driver.cxx b/evolution/soft-delete/driver.cxx
new file mode 100644
index 0000000..8577819
--- /dev/null
+++ b/evolution/soft-delete/driver.cxx
@@ -0,0 +1,339 @@
+// file      : evolution/soft-delete/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test soft-delete functionality.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/schema-catalog.hxx>
+
+#include <common/common.hxx>
+
+#include "test2.hxx"
+#include "test3.hxx"
+#include "test2-odb.hxx"
+#include "test3-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv, false));
+    bool embedded (schema_catalog::exists (*db));
+
+    // 1 - base version
+    // 2 - migration
+    // 3 - current version
+    //
+    unsigned short pass (*argv[argc - 1] - '0');
+
+    switch (pass)
+    {
+    case 1:
+      {
+        using namespace v2;
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::drop_schema (*db);
+          schema_catalog::drop_schema (*db, "2");
+          schema_catalog::create_schema (*db, "", false);
+          schema_catalog::migrate_schema (*db, 2);
+          t.commit ();
+        }
+
+        // Test soft-deleted objects.
+        //
+        {
+          using namespace test1;
+
+          object o (1);
+          o.num = 123;
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            t.commit ();
+          }
+        }
+
+        // SQLite doesn't support dropping of columns.
+        //
+#ifndef DATABASE_SQLITE
+
+        // Test basic soft-deleted member logic.
+        //
+        {
+          using namespace test2;
+
+          object o (1);
+          o.str = "abc";
+          o.num = 123;
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            t.commit ();
+          }
+        }
+
+#endif // DATABASE_SQLITE
+        break;
+      }
+    case 2:
+      {
+        using namespace v3;
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_pre (*db, 3);
+          t.commit ();
+        }
+
+        // Test soft-deleted objects.
+        //
+        {
+          using namespace test1;
+
+          {
+            transaction t (db->begin ());
+            auto_ptr<object> p (db->load<object> (1));
+            assert (p->num == 123);
+            t.commit ();
+          }
+        }
+
+        // SQLite doesn't support dropping of columns.
+        //
+#ifndef DATABASE_SQLITE
+
+        // Test basic soft-deleted member logic.
+        //
+        {
+          using namespace test2;
+
+          // All the database operations should still include the deleted
+          // member
+          //
+          {
+            transaction t (db->begin ());
+            auto_ptr<object> p (db->load<object> (1));
+            assert (p->str == "abc" && p->num == 123);
+            t.commit ();
+          }
+
+          {
+            typedef odb::query<object> query;
+            typedef odb::result<object> result;
+
+            transaction t (db->begin ());
+            result r (db->query<object> (query::str == "abc"));
+            result::iterator i (r.begin ());
+            assert (i != r.end () && i->str == "abc" && i->num == 123);
+            t.commit ();
+          }
+
+          object o (2);
+          o.str = "bcd";
+          o.num = 234;
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            auto_ptr<object> p (db->load<object> (2));
+            assert (p->str == "bcd" && p->num == 234);
+            t.commit ();
+          }
+
+          o.str += 'e';
+          o.num++;
+
+          {
+            transaction t (db->begin ());
+            db->update (o);
+            auto_ptr<object> p (db->load<object> (2));
+            assert (p->str == "bcde" && p->num == 235);
+            t.commit ();
+          }
+
+          {
+            transaction t (db->begin ());
+            db->erase (o);
+            t.commit ();
+          }
+        }
+
+#endif // DATABASE_SQLITE
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_post (*db, 3);
+          t.commit ();
+        }
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        // Test soft-deleted objects.
+        //
+        {
+          using namespace test1;
+
+          try
+          {
+            transaction t (db->begin ());
+            auto_ptr<object> p (db->load<object> (1)); // No such table.
+            assert (false);
+          }
+          catch (const odb::exception&) {}
+        }
+
+        // SQLite doesn't support dropping of columns.
+        //
+#ifndef DATABASE_SQLITE
+
+        // Test basic soft-deleted member logic.
+        //
+        {
+          using namespace test2;
+
+          // Now none of the database operations should include the
+          // deleted member.
+          //
+          {
+            transaction t (db->begin ());
+            auto_ptr<object> p (db->load<object> (1));
+            assert (p->str == "" && p->num == 123);
+            t.commit ();
+          }
+
+          {
+            typedef odb::query<object> query;
+            typedef odb::result<object> result;
+
+            transaction t (db->begin ());
+            result r (db->query<object> (query::num == 123));
+            result::iterator i (r.begin ());
+            assert (i != r.end () && i->str == "" && i->num == 123);
+
+            try
+            {
+              db->query<object> (query::str == "abc"); // No such column.
+              assert (false);
+            }
+            catch (const odb::exception&) {}
+
+            t.commit ();
+          }
+
+          object o (2);
+          o.str = "bcd";
+          o.num = 234;
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            auto_ptr<object> p (db->load<object> (2));
+            assert (p->str == "" && p->num == 234);
+            t.commit ();
+          }
+
+          o.str += 'e';
+          o.num++;
+
+          {
+            transaction t (db->begin ());
+            db->update (o);
+            auto_ptr<object> p (db->load<object> (2));
+            assert (p->str == "" && p->num == 235);
+            t.commit ();
+          }
+
+          {
+            transaction t (db->begin ());
+            db->erase (o);
+            t.commit ();
+          }
+        }
+
+        // Test empty statement handling (INSERT, UPDATE).
+        //
+        {
+          using namespace test3;
+
+          // Now none of the database operations should include the
+          // deleted member.
+          //
+          object o;
+          o.str = "bcd";
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            auto_ptr<object> p (db->load<object> (o.id));
+            assert (p->str == "");
+            t.commit ();
+          }
+
+          o.str += 'e';
+
+          {
+            transaction t (db->begin ());
+            db->update (o);
+            auto_ptr<object> p (db->load<object> (o.id));
+            assert (p->str == "");
+            t.commit ();
+          }
+        }
+
+        // Test empty statement handling (SELECT in polymorphic loader).
+        //
+        {
+          using namespace test4;
+
+          // Now none of the database operations should include the
+          // deleted member.
+          //
+          object o (1);
+          o.str = "abc";
+
+          {
+            transaction t (db->begin ());
+            db->persist (o);
+            auto_ptr<base> p (db->load<base> (1));
+            assert (static_cast<object&> (*p).str == "");
+            t.commit ();
+          }
+        }
+
+#endif // DATABASE_SQLITE
+        break;
+      }
+    default:
+      {
+        cerr << "unknown pass number '" << argv[argc - 1] << "'" << endl;
+        return 1;
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/evolution/soft-delete/makefile b/evolution/soft-delete/makefile
new file mode 100644
index 0000000..da284c7
--- /dev/null
+++ b/evolution/soft-delete/makefile
@@ -0,0 +1,143 @@
+# file      : evolution/soft-delete/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 := test1.hxx test2.hxx test3.hxx
+genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
+gen1    := $(addprefix $(out_base)/,$(genf1))
+genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
+gen2    := $(addprefix $(out_base)/,$(genf2))
+genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
+gen3    := $(addprefix $(out_base)/,$(genf3))
+genf    := $(genf1) $(genf2) $(genf3)
+gen     := $(gen1) $(gen2) $(gen3)
+gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
+test3-003-pre.sql test3-003-post.sql
+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): odb_common_options = --generate-query \
+--generate-schema --at-once --table-prefix evo_soft_d_
+$(gen): odb_common_options += --database $(db_id)
+$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
+$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
+--schema-name 2 --suppress-migration
+$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
+$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
+$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
+$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Make sure testN.hxx are compiled serially since they share the
+# changelog. Also add dependency on model.hxx
+#
+$(gen2): $(gen1)
+$(gen3): $(gen2)
+$(gen): $(src_base)/model.hxx
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
+
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): export extra_headers := model.hxx
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(call vc8projs,$(name)) \
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(extra_headers))
+	$(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.
+#
+$(test): $(driver)
+        # Drop everything.
+	$(call schema,$(out_base)/test3.sql)
+	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
+        # Base schema.
+	$(call schema,$(out_base)/test3-002-pre.sql)
+	$(call schema,$(out_base)/test3-002-post.sql)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
+        # Migration.
+	$(call schema,$(out_base)/test3-003-pre.sql)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
+	$(call schema,$(out_base)/test3-003-post.sql)
+        # Current schema.
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
+
+# 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)/model.xml)   # Changelog.
+	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
+$(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/evolution/soft-delete/model.hxx b/evolution/soft-delete/model.hxx
new file mode 100644
index 0000000..1690583
--- /dev/null
+++ b/evolution/soft-delete/model.hxx
@@ -0,0 +1,123 @@
+// file      : evolution/soft-delete/model.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef MODEL_VERSION
+#  error model.hxx included directly
+#endif
+
+#include <string>
+
+#include <odb/core.hxx>
+#include <odb/nullable.hxx>
+
+#include <common/config.hxx> // DATABASE_XXX
+
+#pragma db model version(1, MODEL_VERSION)
+
+#define MODEL_NAMESPACE_IMPL(V) v##V
+#define MODEL_NAMESPACE(V) MODEL_NAMESPACE_IMPL(V)
+
+namespace MODEL_NAMESPACE(MODEL_VERSION)
+{
+  // Test soft-deleted objects.
+  //
+  #pragma db namespace table("t1_")
+  namespace test1
+  {
+    #pragma db object
+    struct object
+    {
+      object (unsigned long id = 0): id_ (id) {}
+
+      #pragma db id
+      unsigned long id_;
+
+      unsigned long num;
+    };
+
+#if MODEL_VERSION == 3
+    #pragma db object(object) deleted(3)
+#endif
+  }
+
+  // SQLite doesn't support dropping of columns.
+  //
+#ifndef DATABASE_SQLITE
+
+  // Test basic soft-deleted member logic.
+  //
+  #pragma db namespace table("t2_")
+  namespace test2
+  {
+    #pragma db object
+    struct object
+    {
+      object (unsigned long id = 0): id_ (id) {}
+
+      #pragma db id
+      unsigned long id_;
+
+      std::string str;
+      unsigned long num;
+    };
+
+#if MODEL_VERSION == 3
+    #pragma db member(object::str) deleted(3)
+#endif
+  }
+
+  // Test empty statement handling (INSERT, UPDATE).
+  //
+  #pragma db namespace table("t3_")
+  namespace test3
+  {
+    #pragma db object
+    struct object
+    {
+      #pragma db id auto
+      unsigned long id;
+
+      std::string str;
+    };
+
+#if MODEL_VERSION == 3
+    #pragma db member(object::str) deleted(3)
+#endif
+  }
+
+  // Test empty statement handling (SELECT in polymorphic loader).
+  //
+  #pragma db namespace table("t4_")
+  namespace test4
+  {
+    #pragma db object polymorphic
+    struct base
+    {
+      virtual
+      ~base () {}
+      base (unsigned long id = 0): id_ (id) {}
+
+      #pragma db id
+      unsigned long id_;
+    };
+
+    #pragma db object
+    struct object: base
+    {
+      object (unsigned long id = 0): base (id) {}
+
+      std::string str;
+    };
+
+#if MODEL_VERSION == 3
+    #pragma db member(object::str) deleted(3)
+#endif
+  }
+
+#endif // DATABASE_SQLITE
+
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/evolution/soft-delete/test1.hxx b/evolution/soft-delete/test1.hxx
new file mode 100644
index 0000000..5bd4729
--- /dev/null
+++ b/evolution/soft-delete/test1.hxx
@@ -0,0 +1,10 @@
+// file      : evolution/soft-delete/test1.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST1_HXX
+#define TEST1_HXX
+
+#pragma db model version(1, 1)
+
+#endif // TEST1_HXX
diff --git a/evolution/soft-delete/test2.hxx b/evolution/soft-delete/test2.hxx
new file mode 100644
index 0000000..b1886cb
--- /dev/null
+++ b/evolution/soft-delete/test2.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/soft-delete/test2.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST2_HXX
+#define TEST2_HXX
+
+#define MODEL_VERSION 2
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST2_HXX
diff --git a/evolution/soft-delete/test3.hxx b/evolution/soft-delete/test3.hxx
new file mode 100644
index 0000000..00ac7ca
--- /dev/null
+++ b/evolution/soft-delete/test3.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/soft-delete/test3.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST3_HXX
+#define TEST3_HXX
+
+#define MODEL_VERSION 3
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST3_HXX