4 files changed, 229 insertions, 0 deletions
diff --git a/odb-tests/common/id/auto/buildfile b/odb-tests/common/id/auto/buildfile
new file mode 100644
index 0000000..c340200
--- /dev/null
+++ b/odb-tests/common/id/auto/buildfile
@@ -0,0 +1,40 @@
+# file      : common/id/auto/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+import libodb = libodb%lib{odb}
+
+libs =
+
+for db: $databases
+  import libs += libodb-$db%lib{odb-$db}
+
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-odb} testscript
+
+# Introduce the metadata library target to make sure the libodb library is
+# resolved for the odb_compile ad hoc rule (see build/root.build for details).
+#
+libue{test-meta}: $libodb
+
+<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta}
+
+for db: $databases
+{
+  exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi
+  <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta}
+}
+
+exe{driver}: libue{test-meta} $libs
+
+# Specify the ODB custom options to be used by the odb_compile ad hoc rule
+# (see build/root.build for details).
+#
+odb_options = --table-prefix t_id_auto_ \
+              --generate-schema
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/odb-tests/common/id/auto/driver.cxx b/odb-tests/common/id/auto/driver.cxx
new file mode 100644
index 0000000..d294e69
--- /dev/null
+++ b/odb-tests/common/id/auto/driver.cxx
@@ -0,0 +1,96 @@
+// file      : common/id/auto/driver.cxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test automatic id assignment.
+//
+
+#include <memory>   // std::unique_ptr
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <libcommon/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+#undef NDEBUG
+#include <cassert>
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    unique_ptr<database> db (create_database (argc, argv));
+
+    // object
+    //
+    {
+      unsigned long id1, id2, id3;
+      {
+        object o1 ("one");
+        object o2 ("two");
+        object o3 ("three");
+
+        transaction t (db->begin ());
+        db->persist (o1);
+        db->persist (o2);
+        db->persist (o3);
+        t.commit ();
+
+        id1 = o1.id_;
+        id2 = o2.id_;
+        id3 = o3.id_;
+
+        assert (id1 != id2);
+        assert (id1 != id3);
+        assert (id2 != id3);
+      }
+
+      {
+        transaction t (db->begin ());
+        unique_ptr<object> o1 (db->load<object> (id1));
+        unique_ptr<object> o2 (db->load<object> (id2));
+        unique_ptr<object> o3 (db->load<object> (id3));
+        t.commit ();
+
+        assert (o1->id_ == id1 && o1->str_ == "one");
+        assert (o2->id_ == id2 && o2->str_ == "two");
+        assert (o3->id_ == id3 && o3->str_ == "three");
+      }
+    }
+
+    // auto_only
+    //
+    {
+      unsigned short id;
+      {
+        auto_only o;
+
+        transaction t (db->begin ());
+        db->persist (o);
+        t.commit ();
+
+        id = o.id_;
+      }
+
+      {
+        transaction t (db->begin ());
+        unique_ptr<auto_only> o (db->load<auto_only> (id));
+        t.commit ();
+
+        assert (o->id_ == id);
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/odb-tests/common/id/auto/test.hxx b/odb-tests/common/id/auto/test.hxx
new file mode 100644
index 0000000..233c79f
--- /dev/null
+++ b/odb-tests/common/id/auto/test.hxx
@@ -0,0 +1,40 @@
+// file      : common/id/auto/test.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <string>
+
+#include <odb/core.hxx>
+
+#pragma db object
+struct object
+{
+  object (const std::string& str)
+      : id_ (1), str_ (str)
+  {
+  }
+
+  #pragma db auto id
+  unsigned long id_;
+  std::string str_;
+
+private:
+  object ()
+  {
+  }
+
+  friend class odb::access;
+};
+
+// Test the case where the object has just the auto id.
+//
+#pragma db object
+struct auto_only
+{
+  #pragma db auto id pgsql:type("BIGINT")
+  unsigned short id_;
+};
+
+#endif // TEST_HXX
diff --git a/odb-tests/common/id/auto/testscript b/odb-tests/common/id/auto/testscript
new file mode 100644
index 0000000..641f03d
--- /dev/null
+++ b/odb-tests/common/id/auto/testscript
@@ -0,0 +1,53 @@
+# file      : common/id/auto/testscript
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
+: mysql
+:
+if $mysql
+{
+  .include ../../../mysql.testscript
+
+  $create_schema;
+  $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+  .include ../../../sqlite.testscript
+
+  $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+  .include ../../../pgsql.testscript
+
+  $create_schema;
+  $*
+}
+
+: oracle
+:
+if $oracle
+{
+  .include ../../../oracle.testscript
+
+  $create_schema;
+  $*
+}
+
+: mssql
+:
+if $mssql
+{
+  .include ../../../mssql.testscript
+
+  $create_schema;
+  $*
+}