5 files changed, 218 insertions, 0 deletions
diff --git a/odb-tests/evolution/drop-index/driver.cxx b/odb-tests/evolution/drop-index/driver.cxx
new file mode 100644
index 0000000..5ad1cd4
--- /dev/null
+++ b/odb-tests/evolution/drop-index/driver.cxx
@@ -0,0 +1,154 @@
+// file      : evolution/drop-index/driver.cxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test dropping an index.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/schema-catalog.hxx>
+
+#include <common/common.hxx>
+
+#include "test2.hxx"
+#include "test3.hxx"
+#include "test2-odb.hxx"
+#include "test3-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv, false));
+    bool embedded (schema_catalog::exists (*db));
+
+    // 1 - base version
+    // 2 - migration
+    // 3 - current version
+    //
+    unsigned short pass (*argv[argc - 1] - '0');
+
+    switch (pass)
+    {
+    case 1:
+      {
+        using namespace v2;
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::drop_schema (*db);
+          schema_catalog::create_schema (*db, "", false);
+          schema_catalog::migrate_schema (*db, 2);
+          t.commit ();
+        }
+
+        object o0 (0);
+        o0.num = 123;
+
+        object o1 (1);
+        o1.num = 234;
+
+        object o2 (2);
+        o2.num = 234;
+
+        {
+          transaction t (db->begin ());
+          db->persist (o0);
+          db->persist (o1);
+          t.commit ();
+        }
+
+        // Duplicates are not ok.
+        //
+        try
+        {
+          transaction t (db->begin ());
+          db->persist (o2);
+          assert (false);
+        }
+        catch (const odb::exception& ) {}
+
+        break;
+      }
+    case 2:
+      {
+        using namespace v3;
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_pre (*db, 3);
+          t.commit ();
+        }
+
+        // Duplicates are now ok.
+        //
+        object o2 (2);
+        o2.num = 234;
+
+        {
+          transaction t (db->begin ());
+          db->persist (o2);
+          t.commit ();
+        }
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_post (*db, 3);
+          t.commit ();
+        }
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object> p0 (db->load<object> (0));
+          auto_ptr<object> p1 (db->load<object> (1));
+          auto_ptr<object> p2 (db->load<object> (2));
+
+          assert (p0->num == 123);
+          assert (p1->num == 234);
+          assert (p2->num == 234);
+
+          t.commit ();
+        }
+
+        // Duplicates are still ok.
+        //
+        object o3 (3);
+        o3.num = 234;
+
+        {
+          transaction t (db->begin ());
+          db->persist (o3);
+          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/odb-tests/evolution/drop-index/model.hxx b/odb-tests/evolution/drop-index/model.hxx
new file mode 100644
index 0000000..5e163ca
--- /dev/null
+++ b/odb-tests/evolution/drop-index/model.hxx
@@ -0,0 +1,33 @@
+// file      : evolution/drop-index/model.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef MODEL_VERSION
+#  error model.hxx included directly
+#endif
+
+#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
+  {
+    object (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+
+#if MODEL_VERSION == 2
+    #pragma db unique
+#endif
+    unsigned long num;
+  };
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/odb-tests/evolution/drop-index/test1.hxx b/odb-tests/evolution/drop-index/test1.hxx
new file mode 100644
index 0000000..5a279bb
--- /dev/null
+++ b/odb-tests/evolution/drop-index/test1.hxx
@@ -0,0 +1,9 @@
+// file      : evolution/drop-index/test1.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST1_HXX
+#define TEST1_HXX
+
+#pragma db model version(1, 1)
+
+#endif // TEST1_HXX
diff --git a/odb-tests/evolution/drop-index/test2.hxx b/odb-tests/evolution/drop-index/test2.hxx
new file mode 100644
index 0000000..78b89f2
--- /dev/null
+++ b/odb-tests/evolution/drop-index/test2.hxx
@@ -0,0 +1,11 @@
+// file      : evolution/drop-index/test2.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST2_HXX
+#define TEST2_HXX
+
+#define MODEL_VERSION 2
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST2_HXX
diff --git a/odb-tests/evolution/drop-index/test3.hxx b/odb-tests/evolution/drop-index/test3.hxx
new file mode 100644
index 0000000..17b670d
--- /dev/null
+++ b/odb-tests/evolution/drop-index/test3.hxx
@@ -0,0 +1,11 @@
+// file      : evolution/drop-index/test3.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST3_HXX
+#define TEST3_HXX
+
+#define MODEL_VERSION 3
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST3_HXX