4 files changed, 154 insertions, 0 deletions
diff --git a/mysql/database/driver.cxx b/mysql/database/driver.cxx
new file mode 100644
index 0000000..e9b625d
--- /dev/null
+++ b/mysql/database/driver.cxx
@@ -0,0 +1,69 @@
+// file      : mysql/database/driver.cxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test that database constructors are unambiguous (compilation only).
+//
+
+#include <string>
+
+#include <odb/mysql/database.hxx>
+
+using std::string;
+using namespace odb::mysql;
+
+int
+main (int argc, char* argv[])
+{
+  // This code should not execute.
+  //
+  if (argc != 0)
+    return 0;
+
+  {
+    database d1 (0, 0, 0);
+    database d2 ("bob", "secret", "db1");
+    database d3 ("bob", "secret", "db1", "server1");
+    database d4 ("bob", "secret", "db1", "server1", 999);
+    database d5 ("bob", "secret", "db1", "server1", 999, "sock1");
+    database d6 ("bob", "secret", "db1", "server1", 999, "sock1", "charset1");
+  }
+
+  std::string u ("bob"), p ("secret"), db ("bd1"), h ("server1"),
+    s ("sock1"), cs ("charset1");
+
+  {
+    database d1 (u, p, db);
+    database d2 (u, p, db, h);
+    database d3 (u, p, db, h, 999);
+    database d4 (u, p, db, h, 999, &s);
+    database d5 (u, p, db, h, 999, &s, cs);
+  }
+
+  {
+    database d1 (u, 0, db);
+    database d2 (u, &p, db);
+    database d3 (u, &p, db, h);
+    database d4 (u, &p, db, h, 999);
+    database d5 (u, &p, db, h, 999, &s);
+    database d6 (u, &p, db, h, 999, &s, cs);
+  }
+
+  {
+    database d1 (u, p, db, h, 999, "socket1");
+    database d2 (u, p, db, h, 999, s);
+    database d3 (u, p, db, h, 999, s, cs);
+  }
+
+  {
+    database d1 (u, 0, db, h, 999, s);
+    database d2 (u, &p, db, h, 999, "socket1");
+    database d3 (u, &p, db, h, 999, s, cs);
+  }
+
+  {
+    database d1 (argc, argv);
+    database d2 (argc, argv, false);
+    database d3 (argc, argv, true, "charset1");
+  }
+}
diff --git a/mysql/database/makefile b/mysql/database/makefile
new file mode 100644
index 0000000..486da1b
--- /dev/null
+++ b/mysql/database/makefile
@@ -0,0 +1,84 @@
+# file      : mysql/database/makefile
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.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
+
+# 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)
+
+$(call include-dep,$(cxx_od))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+$(dist): sources := $(cxx_tun)
+$(dist): data_dist := test.std
+$(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base)))
+$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \
+$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters
+$(dist):
+	$(call dist-data,$(sources) $(data_dist))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
+	$(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver
+$(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/automake.make)
+
+$(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/mysql/database/test.std b/mysql/database/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mysql/database/test.std
diff --git a/mysql/makefile b/mysql/makefile
index ccd0087..dfbb5da 100644
--- a/mysql/makefile
+++ b/mysql/makefile
@@ -7,6 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 tests :=      \
 template      \
 custom        \
+database      \
 index         \
 native        \
 truncation    \