Generate add/drop foreign key migration statements

Also add the --fkeys-deferrable-mode option. General schemas generation
rework.

48 files changed, 743 insertions, 45 deletions

diff --git a/common/changelog/add-foreign-key-diff.xml b/common/changelog/add-foreign-key-diff.xml
index 34c0952..06079b8 100644
--- a/common/changelog/add-foreign-key-diff.xml
+++ b/common/changelog/add-foreign-key-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="INTEGER" null="true"/>
-      <add-foreign-key name="o1_fk" deferred="true">
+      <add-foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mssql-diff.xml b/common/changelog/add-foreign-key-mssql-diff.xml
index 594f253..cc231a2 100644
--- a/common/changelog/add-foreign-key-mssql-diff.xml
+++ b/common/changelog/add-foreign-key-mssql-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="INT" null="true"/>
-      <add-foreign-key name="object_o1_fk" deferred="true">
+      <add-foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mssql-patch.xml b/common/changelog/add-foreign-key-mssql-patch.xml
index 17e5d14..e15f436 100644
--- a/common/changelog/add-foreign-key-mssql-patch.xml
+++ b/common/changelog/add-foreign-key-mssql-patch.xml
@@ -6,7 +6,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mysql-diff.xml b/common/changelog/add-foreign-key-mysql-diff.xml
index 594f253..cc231a2 100644
--- a/common/changelog/add-foreign-key-mysql-diff.xml
+++ b/common/changelog/add-foreign-key-mysql-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="INT" null="true"/>
-      <add-foreign-key name="object_o1_fk" deferred="true">
+      <add-foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mysql-patch.xml b/common/changelog/add-foreign-key-mysql-patch.xml
index 17e5d14..e15f436 100644
--- a/common/changelog/add-foreign-key-mysql-patch.xml
+++ b/common/changelog/add-foreign-key-mysql-patch.xml
@@ -6,7 +6,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-oracle-diff.xml b/common/changelog/add-foreign-key-oracle-diff.xml
index 14f2357..3131542 100644
--- a/common/changelog/add-foreign-key-oracle-diff.xml
+++ b/common/changelog/add-foreign-key-oracle-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="NUMBER(10)" null="true"/>
-      <add-foreign-key name="object_o1_fk" deferred="true">
+      <add-foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-oracle-patch.xml b/common/changelog/add-foreign-key-oracle-patch.xml
index 6168736..7984282 100644
--- a/common/changelog/add-foreign-key-oracle-patch.xml
+++ b/common/changelog/add-foreign-key-oracle-patch.xml
@@ -6,7 +6,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-pgsql-diff.xml b/common/changelog/add-foreign-key-pgsql-diff.xml
index 34c0952..06079b8 100644
--- a/common/changelog/add-foreign-key-pgsql-diff.xml
+++ b/common/changelog/add-foreign-key-pgsql-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="INTEGER" null="true"/>
-      <add-foreign-key name="o1_fk" deferred="true">
+      <add-foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-pgsql-patch.xml b/common/changelog/add-foreign-key-pgsql-patch.xml
index e70ad87..6422322 100644
--- a/common/changelog/add-foreign-key-pgsql-patch.xml
+++ b/common/changelog/add-foreign-key-pgsql-patch.xml
@@ -6,7 +6,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-sqlite-diff.xml b/common/changelog/add-foreign-key-sqlite-diff.xml
index 34c0952..06079b8 100644
--- a/common/changelog/add-foreign-key-sqlite-diff.xml
+++ b/common/changelog/add-foreign-key-sqlite-diff.xml
@@ -2,7 +2,7 @@
   <changeset version="2">
     <alter-table name="object">
       <add-column name="o1" type="INTEGER" null="true"/>
-      <add-foreign-key name="o1_fk" deferred="true">
+      <add-foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-foreign-key-sqlite-patch.xml b/common/changelog/add-foreign-key-sqlite-patch.xml
index e70ad87..6422322 100644
--- a/common/changelog/add-foreign-key-sqlite-patch.xml
+++ b/common/changelog/add-foreign-key-sqlite-patch.xml
@@ -6,7 +6,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-mssql-diff.xml b/common/changelog/add-table-mssql-diff.xml
index 8d3a95d..4e9c97f 100644
--- a/common/changelog/add-table-mssql-diff.xml
+++ b/common/changelog/add-table-mssql-diff.xml
@@ -7,7 +7,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-mssql-patch.xml b/common/changelog/add-table-mssql-patch.xml
index 204a5a9..0edc34d 100644
--- a/common/changelog/add-table-mssql-patch.xml
+++ b/common/changelog/add-table-mssql-patch.xml
@@ -14,7 +14,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-mysql-diff.xml b/common/changelog/add-table-mysql-diff.xml
index 019e51c..f158c9c 100644
--- a/common/changelog/add-table-mysql-diff.xml
+++ b/common/changelog/add-table-mysql-diff.xml
@@ -7,7 +7,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-mysql-patch.xml b/common/changelog/add-table-mysql-patch.xml
index 127139a..1781451 100644
--- a/common/changelog/add-table-mysql-patch.xml
+++ b/common/changelog/add-table-mysql-patch.xml
@@ -14,7 +14,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-oracle-diff.xml b/common/changelog/add-table-oracle-diff.xml
index e04ba2b..642d06e 100644
--- a/common/changelog/add-table-oracle-diff.xml
+++ b/common/changelog/add-table-oracle-diff.xml
@@ -7,7 +7,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-oracle-patch.xml b/common/changelog/add-table-oracle-patch.xml
index b0e32c0..461f3eb 100644
--- a/common/changelog/add-table-oracle-patch.xml
+++ b/common/changelog/add-table-oracle-patch.xml
@@ -14,7 +14,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-pgsql-diff.xml b/common/changelog/add-table-pgsql-diff.xml
index 61c4985..6bec713 100644
--- a/common/changelog/add-table-pgsql-diff.xml
+++ b/common/changelog/add-table-pgsql-diff.xml
@@ -7,7 +7,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-pgsql-patch.xml b/common/changelog/add-table-pgsql-patch.xml
index 33f8850..f20d442 100644
--- a/common/changelog/add-table-pgsql-patch.xml
+++ b/common/changelog/add-table-pgsql-patch.xml
@@ -14,7 +14,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-sqlite-diff.xml b/common/changelog/add-table-sqlite-diff.xml
index 97b7e24..3971906 100644
--- a/common/changelog/add-table-sqlite-diff.xml
+++ b/common/changelog/add-table-sqlite-diff.xml
@@ -7,7 +7,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/add-table-sqlite-patch.xml b/common/changelog/add-table-sqlite-patch.xml
index 84c9d75..dd25b79 100644
--- a/common/changelog/add-table-sqlite-patch.xml
+++ b/common/changelog/add-table-sqlite-patch.xml
@@ -14,7 +14,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mssql-diff.xml b/common/changelog/drop-foreign-key-mssql-diff.xml
index 30dba42..6840f2e 100644
--- a/common/changelog/drop-foreign-key-mssql-diff.xml
+++ b/common/changelog/drop-foreign-key-mssql-diff.xml
@@ -13,7 +13,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mysql-diff.xml b/common/changelog/drop-foreign-key-mysql-diff.xml
index 30dba42..6840f2e 100644
--- a/common/changelog/drop-foreign-key-mysql-diff.xml
+++ b/common/changelog/drop-foreign-key-mysql-diff.xml
@@ -13,7 +13,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-oracle-diff.xml b/common/changelog/drop-foreign-key-oracle-diff.xml
index 8a36172..b9dc4a8 100644
--- a/common/changelog/drop-foreign-key-oracle-diff.xml
+++ b/common/changelog/drop-foreign-key-oracle-diff.xml
@@ -13,7 +13,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-pgsql-diff.xml b/common/changelog/drop-foreign-key-pgsql-diff.xml
index 8f7c6f1..6821cca 100644
--- a/common/changelog/drop-foreign-key-pgsql-diff.xml
+++ b/common/changelog/drop-foreign-key-pgsql-diff.xml
@@ -13,7 +13,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-sqlite-diff.xml b/common/changelog/drop-foreign-key-sqlite-diff.xml
index 8f7c6f1..6821cca 100644
--- a/common/changelog/drop-foreign-key-sqlite-diff.xml
+++ b/common/changelog/drop-foreign-key-sqlite-diff.xml
@@ -13,7 +13,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-table-mssql-diff.xml b/common/changelog/drop-table-mssql-diff.xml
index 7d6779e..3f46d65 100644
--- a/common/changelog/drop-table-mssql-diff.xml
+++ b/common/changelog/drop-table-mssql-diff.xml
@@ -12,7 +12,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-table-mysql-diff.xml b/common/changelog/drop-table-mysql-diff.xml
index 4b223fb..5cf2490 100644
--- a/common/changelog/drop-table-mysql-diff.xml
+++ b/common/changelog/drop-table-mysql-diff.xml
@@ -12,7 +12,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-table-oracle-diff.xml b/common/changelog/drop-table-oracle-diff.xml
index 9334585..70c06a1 100644
--- a/common/changelog/drop-table-oracle-diff.xml
+++ b/common/changelog/drop-table-oracle-diff.xml
@@ -12,7 +12,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-table-pgsql-diff.xml b/common/changelog/drop-table-pgsql-diff.xml
index 18d01f6..6a4d523 100644
--- a/common/changelog/drop-table-pgsql-diff.xml
+++ b/common/changelog/drop-table-pgsql-diff.xml
@@ -12,7 +12,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/drop-table-sqlite-diff.xml b/common/changelog/drop-table-sqlite-diff.xml
index 5277fd8..61d06d2 100644
--- a/common/changelog/drop-table-sqlite-diff.xml
+++ b/common/changelog/drop-table-sqlite-diff.xml
@@ -12,7 +12,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1"/>
         <references table="object1">
           <column name="id"/>
diff --git a/common/changelog/model-mssql.xml b/common/changelog/model-mssql.xml
index d9689a0..95bc102 100644
--- a/common/changelog/model-mssql.xml
+++ b/common/changelog/model-mssql.xml
@@ -10,7 +10,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1_x"/>
         <column name="o1_y"/>
         <references table="object1">
diff --git a/common/changelog/model-mysql.xml b/common/changelog/model-mysql.xml
index ed46ebe..a6a811a 100644
--- a/common/changelog/model-mysql.xml
+++ b/common/changelog/model-mysql.xml
@@ -10,7 +10,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1_x"/>
         <column name="o1_y"/>
         <references table="object1">
diff --git a/common/changelog/model-oracle.xml b/common/changelog/model-oracle.xml
index 756a355..73fb592 100644
--- a/common/changelog/model-oracle.xml
+++ b/common/changelog/model-oracle.xml
@@ -10,7 +10,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="object_o1_fk" deferred="true">
+      <foreign-key name="object_o1_fk" deferrable="DEFERRED">
         <column name="o1_x"/>
         <column name="o1_y"/>
         <references table="object1">
diff --git a/common/changelog/model-pgsql.xml b/common/changelog/model-pgsql.xml
index 6dad23b..8679129 100644
--- a/common/changelog/model-pgsql.xml
+++ b/common/changelog/model-pgsql.xml
@@ -10,7 +10,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1_x"/>
         <column name="o1_y"/>
         <references table="object1">
diff --git a/common/changelog/model-sqlite.xml b/common/changelog/model-sqlite.xml
index 9f22af0..1690d2d 100644
--- a/common/changelog/model-sqlite.xml
+++ b/common/changelog/model-sqlite.xml
@@ -10,7 +10,7 @@
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
-      <foreign-key name="o1_fk" deferred="true">
+      <foreign-key name="o1_fk" deferrable="DEFERRED">
         <column name="o1_x"/>
         <column name="o1_y"/>
         <references table="object1">
diff --git a/evolution/add-foreign-key/driver.cxx b/evolution/add-foreign-key/driver.cxx
new file mode 100644
index 0000000..0d62889
--- /dev/null
+++ b/evolution/add-foreign-key/driver.cxx
@@ -0,0 +1,140 @@
+// file      : evolution/add-foreign-key/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test adding a foreign key.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test1.hxx"
+#include "test2.hxx"
+#include "test1-odb.hxx"
+#include "test2-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    // 1 - base version
+    // 2 - migration
+    // 3 - current version
+    //
+    unsigned short pass (*argv[argc - 1] - '0');
+
+    switch (pass)
+    {
+    case 1:
+      {
+        using namespace v2;
+
+        object o (1);
+
+        {
+          transaction t (db->begin ());
+          db->persist (o);
+          t.commit ();
+        }
+        break;
+      }
+    case 2:
+      {
+        using namespace v3;
+
+        // Both pointers are now NULL.
+        //
+        {
+          transaction t (db->begin ());
+          auto_ptr<object> p (db->load<object> (1));
+
+          assert (p->o1 == 0 && p->o2 == 0);
+
+          // Migration. The foreign key constraint is not yet there.
+          //
+          p->o1 = new object1 (1);
+          p->o2 = new object2 (1);
+          db->update (*p);
+
+          t.commit ();
+        }
+
+        // Migration. Add the missing objects.
+        //
+        object1 o1 (1);
+        object2 o2 (1);
+
+        {
+          transaction t (db->begin ());
+          db->persist (o1);
+          db->persist (o2);
+          t.commit ();
+        }
+
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object> p (db->load<object> (1));
+          assert (p->o1->id_ == 1);
+          assert (p->o2->id_ == 1);
+          t.commit ();
+        }
+
+        // Now the foreign key constraint is there.
+        //
+        try
+        {
+          object o (2);
+          o.o1 = new object1 (2);
+          o.o2 = new object2 (2);
+
+          transaction t (db->begin ());
+          db->persist (o);
+          assert (false);
+        }
+        catch (const odb::exception& ) {}
+
+        // As well as the NOT NULL.
+        //
+        try
+        {
+          object o (3);
+          o.o2 = 0;
+
+          transaction t (db->begin ());
+          db->persist (o);
+          assert (false);
+        }
+        catch (const odb::exception& ) {}
+        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/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
new file mode 100644
index 0000000..88942b3
--- /dev/null
+++ b/evolution/add-foreign-key/makefile
@@ -0,0 +1,143 @@
+# file      : evolution/add-foreign-key/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
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# 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)
+
+genf1 := test1-odb.hxx test1-odb.ixx test1-odb.cxx test1.sql model.xml
+gen1  := $(addprefix $(out_base)/,$(genf1))
+
+genf2 := test2-odb.hxx test2-odb.ixx test2-odb.cxx test2.sql \
+test2-002-pre.sql test2-002-post.sql test2-003-pre.sql test2-003-post.sql
+gen2  := $(addprefix $(out_base)/,$(genf2))
+
+genf := $(genf1) $(genf2)
+gen  := $(gen1) $(gen2)
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+--generate-schema --omit-create --at-once --fkeys-deferrable-mode \
+not_deferrable --table-prefix evo_add_fk_
+$(gen1) $(dist): export odb_options1 = $(odb_common_options) --schema-name \
+test1 --init-changelog --suppress-migration
+$(gen2) $(dist): export odb_options2 = $(odb_common_options) --schema-name \
+test2
+$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
+$(gen2): odb_options += $(odb_options2) --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 test2.hxx is compiled before test1.hxx since they share the
+# changelog. Also add dependency on model.hxx
+#
+$(gen2): $(gen1)
+$(gen): $(src_base)/model.hxx
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): export extra_headers := model.hxx
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(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-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)/test1.sql)
+	$(call schema,$(out_base)/test2.sql)
+        # Base schema (-post is always empty).
+	$(call schema,$(out_base)/test2-002-pre.sql)
+	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+        # Migration.
+	$(call schema,$(out_base)/test2-003-pre.sql)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call schema,$(out_base)/test2-003-post.sql)
+        # Current schema.
+	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
+	$(call message,,rm -f $(out_base)/test2-*.sql) # Migration files.
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(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/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/add-foreign-key/model.hxx b/evolution/add-foreign-key/model.hxx
new file mode 100644
index 0000000..e73e47a
--- /dev/null
+++ b/evolution/add-foreign-key/model.hxx
@@ -0,0 +1,61 @@
+// file      : evolution/add-foreign-key/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>
+
+#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)
+{
+#if MODEL_VERSION == 3
+  #pragma db object
+  struct object1
+  {
+    object1 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+  };
+
+  #pragma db object
+  struct object2
+  {
+    object2 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+  };
+#endif
+
+  #pragma db object
+  struct object
+  {
+    #pragma db id
+    unsigned long id_;
+
+#if MODEL_VERSION == 2
+    object (unsigned long id = 0): id_ (id) {}
+#else
+    object1* o1;
+
+    #pragma db not_null
+    object2* o2;
+
+    object (unsigned long id = 0): id_ (id), o1 (0), o2 (0) {}
+    ~object () {delete o1; delete o2;}
+#endif
+  };
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/evolution/add-foreign-key/test1.hxx b/evolution/add-foreign-key/test1.hxx
new file mode 100644
index 0000000..c4281dc
--- /dev/null
+++ b/evolution/add-foreign-key/test1.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/add-foreign-key/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
+
+#define MODEL_VERSION 2
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST1_HXX
diff --git a/evolution/add-foreign-key/test2.hxx b/evolution/add-foreign-key/test2.hxx
new file mode 100644
index 0000000..e2d8262
--- /dev/null
+++ b/evolution/add-foreign-key/test2.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/add-foreign-key/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 3
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST2_HXX
diff --git a/evolution/drop-foreign-key/driver.cxx b/evolution/drop-foreign-key/driver.cxx
new file mode 100644
index 0000000..a63886b
--- /dev/null
+++ b/evolution/drop-foreign-key/driver.cxx
@@ -0,0 +1,116 @@
+// file      : evolution/drop-foreign-key/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test dropping a foreign key.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test1.hxx"
+#include "test2.hxx"
+#include "test1-odb.hxx"
+#include "test2-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    // 1 - base version
+    // 2 - migration
+    // 3 - current version
+    //
+    unsigned short pass (*argv[argc - 1] - '0');
+
+    switch (pass)
+    {
+    case 1:
+      {
+        using namespace v2;
+
+        object o (1);
+        o.o1 = new object (2);
+        o.o2 = new object (3);
+
+        {
+          transaction t (db->begin ());
+          db->persist (o.o1);
+          db->persist (o.o2);
+          db->persist (o);
+          t.commit ();
+        }
+
+        // The foreign key constraint is there.
+        //
+        try
+        {
+          object o (11);
+          o.o1 = new object (12);
+          o.o2 = new object (13);
+
+          transaction t (db->begin ());
+          db->persist (o);
+          assert (false);
+        }
+        catch (const odb::exception& ) {}
+        break;
+      }
+    case 2:
+      {
+        using namespace v3;
+
+        // The data is still there but the constraints are gone.
+        //
+        {
+          transaction t (db->begin ());
+          auto_ptr<object> p (db->load<object> (1));
+
+          assert (p->o1 == 2);
+          assert (p->o2 == 3);
+
+          db->erase<object> (p->o1);
+          db->erase<object> (p->o2);
+
+          t.commit ();
+        }
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object> p (db->load<object> (1));
+          assert (p->o1 == 2);
+          assert (p->o2 == 3);
+          t.commit ();
+        }
+        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/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
new file mode 100644
index 0000000..6082e0f
--- /dev/null
+++ b/evolution/drop-foreign-key/makefile
@@ -0,0 +1,143 @@
+# file      : evolution/drop-foreign-key/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
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# 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)
+
+genf1 := test1-odb.hxx test1-odb.ixx test1-odb.cxx test1.sql model.xml
+gen1  := $(addprefix $(out_base)/,$(genf1))
+
+genf2 := test2-odb.hxx test2-odb.ixx test2-odb.cxx test2.sql \
+test2-002-pre.sql test2-002-post.sql test2-003-pre.sql test2-003-post.sql
+gen2  := $(addprefix $(out_base)/,$(genf2))
+
+genf := $(genf1) $(genf2)
+gen  := $(gen1) $(gen2)
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+--generate-schema --omit-create --at-once --fkeys-deferrable-mode \
+not_deferrable --table-prefix evo_drop_fk_
+$(gen1) $(dist): export odb_options1 = $(odb_common_options) --schema-name \
+test1 --init-changelog --suppress-migration
+$(gen2) $(dist): export odb_options2 = $(odb_common_options) --schema-name \
+test2
+$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
+$(gen2): odb_options += $(odb_options2) --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 test2.hxx is compiled before test1.hxx since they share the
+# changelog. Also add dependency on model.hxx
+#
+$(gen2): $(gen1)
+$(gen): $(src_base)/model.hxx
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): export extra_headers := model.hxx
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(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-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)/test1.sql)
+	$(call schema,$(out_base)/test2.sql)
+        # Base schema (-post is always empty).
+	$(call schema,$(out_base)/test2-002-pre.sql)
+	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+        # Migration.
+	$(call schema,$(out_base)/test2-003-pre.sql)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call schema,$(out_base)/test2-003-post.sql)
+        # Current schema.
+	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
+	$(call message,,rm -f $(out_base)/test2-*.sql) # Migration files.
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(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/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/drop-foreign-key/model.hxx b/evolution/drop-foreign-key/model.hxx
new file mode 100644
index 0000000..4f41329
--- /dev/null
+++ b/evolution/drop-foreign-key/model.hxx
@@ -0,0 +1,45 @@
+// file      : evolution/drop-foreign-key/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>
+
+#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)
+{
+  #pragma db object
+  struct object
+  {
+    #pragma db id
+    unsigned long id_;
+
+#if MODEL_VERSION == 2
+    object* o1;
+    object* o2;
+
+    object (unsigned long id = 0): id_ (id), o1 (0), o2 (0) {}
+    ~object () {delete o1; delete o2;}
+#else
+    #pragma db null
+    unsigned long o1;
+
+    #pragma db null
+    unsigned long o2;
+
+    object (unsigned long id = 0): id_ (id) {}
+#endif
+  };
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/evolution/drop-foreign-key/test1.hxx b/evolution/drop-foreign-key/test1.hxx
new file mode 100644
index 0000000..572f0a7
--- /dev/null
+++ b/evolution/drop-foreign-key/test1.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/drop-foreign-key/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
+
+#define MODEL_VERSION 2
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST1_HXX
diff --git a/evolution/drop-foreign-key/test2.hxx b/evolution/drop-foreign-key/test2.hxx
new file mode 100644
index 0000000..b445292
--- /dev/null
+++ b/evolution/drop-foreign-key/test2.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/drop-foreign-key/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 3
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST2_HXX
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index be85fd6..def245e 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -42,7 +42,7 @@ gen  := $(gen1) $(gen2)
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
---generate-schema --omit-create --at-once --table-prefix evo_add_t_
+--generate-schema --omit-create --at-once --table-prefix evo_drop_t_
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --schema-name \
 test1 --init-changelog --suppress-migration
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --schema-name \
diff --git a/evolution/makefile b/evolution/makefile
index 6c38b0f..867fd3e 100644
--- a/evolution/makefile
+++ b/evolution/makefile
@@ -4,14 +4,16 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
-tests :=     \
-add-table    \
-drop-table   \
-add-column   \
-drop-column  \
-alter-column \
-add-index    \
-drop-index   \
+tests :=         \
+add-table        \
+drop-table       \
+add-column       \
+drop-column      \
+alter-column     \
+add-foreign-key  \
+drop-foreign-key \
+add-index        \
+drop-index       \
 template
 
 default   := $(out_base)/