From 82466170040f5ccdfbeaf88e1d450add7b866f4b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 16 Aug 2013 10:57:32 +0200
Subject: Implement soft delete for persistent classes

---
 evolution/drop-table/driver.cxx | 2 +-
 evolution/drop-table/model.hxx  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'evolution/drop-table')

diff --git a/evolution/drop-table/driver.cxx b/evolution/drop-table/driver.cxx
index 1eca664..0a005b5 100644
--- a/evolution/drop-table/driver.cxx
+++ b/evolution/drop-table/driver.cxx
@@ -70,7 +70,7 @@ main (int argc, char* argv[])
       }
     case 2:
       {
-        using namespace v2; // @@ v3; soft immediate drop
+        using namespace v3;
 
         if (embedded)
         {
diff --git a/evolution/drop-table/model.hxx b/evolution/drop-table/model.hxx
index f5bbd9e..64022bb 100644
--- a/evolution/drop-table/model.hxx
+++ b/evolution/drop-table/model.hxx
@@ -29,8 +29,11 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
     std::string str;
   };
 
-#if MODEL_VERSION == 2
+#if MODEL_VERSION > 1
   #pragma db object
+#if MODEL_VERSION == 3
+  #pragma db deleted(3)
+#endif
   struct object1
   {
     object1 (): o (0) {}
-- 
cgit v1.1