aboutsummaryrefslogtreecommitdiff
path: root/evolution
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-08-16 10:57:32 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-09-17 12:04:02 +0200
commit82466170040f5ccdfbeaf88e1d450add7b866f4b (patch)
tree73db0a0b450a30d18c593574526f5a0a5515c291 /evolution
parente8b23f12981a754757c49471f4e4a2376368909b (diff)
Implement soft delete for persistent classes
Diffstat (limited to 'evolution')
-rw-r--r--evolution/drop-table/driver.cxx2
-rw-r--r--evolution/drop-table/model.hxx5
2 files changed, 5 insertions, 2 deletions
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) {}