From b6ebd340651eaf347c86d3ba0dbed82c6cc8fb8d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 16 Sep 2013 07:07:33 +0200
Subject: Implement logical column drop for SQLite

---
 evolution/combined/driver.cxx | 2 +-
 evolution/combined/makefile   | 2 +-
 evolution/combined/model.hxx  | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'evolution/combined')

diff --git a/evolution/combined/driver.cxx b/evolution/combined/driver.cxx
index 8eb3eb2..4152133 100644
--- a/evolution/combined/driver.cxx
+++ b/evolution/combined/driver.cxx
@@ -57,13 +57,13 @@ main (int argc, char* argv[])
         o.dui = 1;
         o.anui = 1;
         o.dnui = 1;
+        o.dc = 1;
         o.dt.push_back (1);
         o.aui = 1;
 
 #ifndef DATABASE_SQLITE
         o.dfk = new object1 (1);
         o.acn = 1;
-        o.dc = 1;
         o.acnn.reset ();
         o.afk = 1;
 #endif
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
index 8aecc83..5c0bbbb 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -37,7 +37,7 @@ $(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_comb_
+--generate-schema --at-once --sqlite-override-null --table-prefix evo_comb_
 $(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 \
diff --git a/evolution/combined/model.hxx b/evolution/combined/model.hxx
index 2cdc9d7..53faddf 100644
--- a/evolution/combined/model.hxx
+++ b/evolution/combined/model.hxx
@@ -122,13 +122,11 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
     std::vector<unsigned long> dt;
 #endif
 
-    // Drop column. Not supported by SQLite.
+    // Drop column. Logical drop (set NULL) in SQLite.
     //
-#ifndef DATABASE_SQLITE
 #if MODEL_VERSION == 2
     unsigned long dc;
 #endif
-#endif
 
     // Alter column NOT NULL. Not supported by SQLite.
     //
-- 
cgit v1.1