Turn odb-tests repository into package for muti-package repositoryodb-tests

5 files changed, 232 insertions, 0 deletions

diff --git a/odb-tests/evolution/version/driver.cxx b/odb-tests/evolution/version/driver.cxx
new file mode 100644
index 0000000..236c9b4
--- /dev/null
+++ b/odb-tests/evolution/version/driver.cxx
@@ -0,0 +1,156 @@
+// file      : evolution/version/driver.cxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test schema version access via the database instance.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/schema-catalog.hxx>
+
+#include <common/config.hxx>  // DATABASE_XXX
+#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);
+
+          assert (db->schema_version () == 0);
+
+          schema_catalog::create_schema (*db, "", false);
+
+          assert (db->schema_version () == 1 && !db->schema_migration ());
+
+          schema_catalog::migrate_schema (*db, 2);
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 2 && !db->schema_migration ());
+
+        {
+          transaction t (db->begin ());
+          object1 o1 (1);
+          o1.num = 123;
+          db->persist (o1);
+          t.commit ();
+        }
+        break;
+      }
+    case 2:
+      {
+        using namespace v2;
+        using namespace v3;
+
+        if (embedded)
+        {
+          assert (db->schema_version () == 2 && !db->schema_migration ());
+
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_pre (*db, 3);
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 3 && db->schema_migration ());
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object1> o1 (db->load<object1> (1));
+          object2 o2 (1);
+          o2.num = o1->num;
+          db->persist (o2);
+          t.commit ();
+        }
+
+        if (embedded)
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_post (*db, 3);
+          t.commit ();
+
+          assert (db->schema_version () == 3 && !db->schema_migration ());
+        }
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        // In transaction.
+        //
+        {
+          transaction t (db->begin ());
+          assert (db->schema_version () == 3 && !db->schema_migration ());
+          t.commit ();
+        }
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object2> o2 (db->load<object2> (1));
+          assert (o2->num == 123);
+          t.commit ();
+        }
+
+        // Test the case where there is still no version table.
+        //
+        db->schema_version_migration (0, false);
+
+        {
+          transaction t (db->begin ());
+
+#ifdef DATABASE_ORACLE
+          db->execute ("DROP TABLE \"schema_version\"");
+#else
+          db->execute ("DROP TABLE schema_version");
+#endif
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 0);
+        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/version/model.hxx b/odb-tests/evolution/version/model.hxx
new file mode 100644
index 0000000..cdda00e
--- /dev/null
+++ b/odb-tests/evolution/version/model.hxx
@@ -0,0 +1,45 @@
+// file      : evolution/version/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)
+{
+#if MODEL_VERSION == 2
+  #pragma db object
+  struct object1
+  {
+    object1 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+
+    int num;
+  };
+#endif
+
+#if MODEL_VERSION == 3
+  #pragma db object
+  struct object2
+  {
+    object2 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+
+    int num;
+  };
+#endif
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/odb-tests/evolution/version/test1.hxx b/odb-tests/evolution/version/test1.hxx
new file mode 100644
index 0000000..a50e54c
--- /dev/null
+++ b/odb-tests/evolution/version/test1.hxx
@@ -0,0 +1,9 @@
+// file      : evolution/version/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/version/test2.hxx b/odb-tests/evolution/version/test2.hxx
new file mode 100644
index 0000000..f7fc1b7
--- /dev/null
+++ b/odb-tests/evolution/version/test2.hxx
@@ -0,0 +1,11 @@
+// file      : evolution/version/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/version/test3.hxx b/odb-tests/evolution/version/test3.hxx
new file mode 100644
index 0000000..364ee31
--- /dev/null
+++ b/odb-tests/evolution/version/test3.hxx
@@ -0,0 +1,11 @@
+// file      : evolution/version/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