aboutsummaryrefslogtreecommitdiff
path: root/evolution/combined
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-09-16 07:07:33 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-09-17 12:04:03 +0200
commitb6ebd340651eaf347c86d3ba0dbed82c6cc8fb8d (patch)
tree78f43b3355d87424a000bb6f2ccd2a117f3affa7 /evolution/combined
parentea176df42469417c37ad050616db23a01277b4e0 (diff)
Implement logical column drop for SQLite
Diffstat (limited to 'evolution/combined')
-rw-r--r--evolution/combined/driver.cxx2
-rw-r--r--evolution/combined/makefile2
-rw-r--r--evolution/combined/model.hxx4
3 files changed, 3 insertions, 5 deletions
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.
//