Merge branch 'master' into bulk

6 files changed, 424 insertions, 1 deletions

diff --git a/mssql/makefile b/mssql/makefile
index 9337a8e..646e776 100644
--- a/mssql/makefile
+++ b/mssql/makefile
@@ -10,6 +10,7 @@ custom        \
 database      \
 native        \
 query         \
+stored-proc   \
 types
 
 $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
diff --git a/mssql/stored-proc/driver.cxx b/mssql/stored-proc/driver.cxx
new file mode 100644
index 0000000..2878486
--- /dev/null
+++ b/mssql/stored-proc/driver.cxx
@@ -0,0 +1,233 @@
+// file      : mssql/stored-proc/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test SQL Server stored procedure support.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/mssql/database.hxx>
+#include <odb/mssql/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+using namespace std;
+namespace mssql = odb::mssql;
+using namespace mssql;
+
+void
+create_procedure (database& db, const string& name, const string& body)
+{
+  transaction t (db.begin ());
+
+  string s (db.query_value<default_schema> ().name);
+
+  db.execute (
+    "IF EXISTS ("
+    "  SELECT * FROM sysobjects"
+    "    WHERE name = '" + name + "' AND user_name(uid) = '" + s +"')"
+    "  DROP PROCEDURE [" + s + "].[" + name + "]");
+
+  db.execute ("CREATE PROCEDURE [" + s + "].[" + name + "] " + body);
+
+  t.commit ();
+}
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_specific_database<database> (argc, argv));
+
+    object o1 (1, "a");
+    object o2 (2, "b");
+    object o3 (3, "c");
+
+    {
+      transaction t (db->begin ());
+      db->persist (o1);
+      db->persist (o2);
+      db->persist (o3);
+      t.commit ();
+    }
+
+    {
+      create_procedure (
+        *db, "select_all_objects",
+        "AS"
+        "  SELECT num, str FROM mssql_stored_proc_object ORDER BY id;");
+
+      typedef odb::result<select_all_objects> result;
+
+      transaction t (db->begin ());
+
+      result r (db->query<select_all_objects> ());
+
+      for (result::iterator i (r.begin ()); i != r.end (); ++i)
+        cout << i->num << " " << i->str << endl;
+      cout << endl;
+
+      t.commit ();
+    }
+
+    {
+      create_procedure (
+        *db, "select_objects",
+        "(@id INT, @n VARCHAR(512))"
+        "AS"
+        "  SELECT str FROM mssql_stored_proc_object "
+        "    WHERE [id] = @id OR [num] = @n ORDER BY id;");
+
+      typedef mssql::query<select_objects> query;
+      typedef odb::result<select_objects> result;
+
+      transaction t (db->begin ());
+
+      result r (db->query<select_objects> (
+                  query::_val (o1.id) + "," + query::_val (o2.num)));
+
+      for (result::iterator i (r.begin ()); i != r.end (); ++i)
+        cout << i->str << endl;
+      cout << endl;
+
+      t.commit ();
+    }
+
+    {
+      create_procedure (
+        *db, "objects_min_max",
+        "(@min INT = NULL OUTPUT, @max INT = NULL OUTPUT)"
+        "AS"
+        "  SELECT @min = MIN(num), @max = MAX(num)"
+        "    FROM mssql_stored_proc_object;");
+
+      create_procedure (
+        *db, "objects_min_max_odb",
+        "AS"
+        "  DECLARE @min INT, @max INT;"
+        "  EXEC objects_min_max @min OUTPUT, @max OUTPUT;"
+        "  SELECT @min, @max;");
+
+      transaction t (db->begin ());
+
+      objects_min_max omm (db->query_value<objects_min_max> ());
+      cout << omm.num_min << " " << omm.num_max << endl
+           << endl;
+
+      t.commit ();
+    }
+
+    {
+      create_procedure (
+        *db, "insert_object_id",
+        "(@n INT, @s VARCHAR(512))"
+        "AS"
+        "  INSERT INTO mssql_stored_proc_object([num], [str])"
+        "    VALUES(@n, @s);");
+
+      {
+        typedef mssql::query<insert_object> query;
+
+        transaction t (db->begin ());
+
+        db->query_one<insert_object> (
+          query::_val (4) + "," + query::_val ("d"));
+
+        auto_ptr<object> o (db->load<object> (4));
+        cout << o->num << " " << o->str << endl
+             << endl;
+
+        t.commit ();
+      }
+
+      {
+        typedef mssql::query<no_result> query;
+
+        transaction t (db->begin ());
+
+        db->query_one<no_result> (
+          "EXEC insert_object_id" + query::_val (5) + "," + query::_val ("e"));
+
+        auto_ptr<object> o (db->load<object> (5));
+        cout << o->num << " " << o->str << endl
+             << endl;
+
+        t.commit ();
+      }
+    }
+
+    {
+      create_procedure (
+        *db, "insert_object_id",
+        "(@n INT, @s VARCHAR(512), @id INT = NULL OUTPUT)"
+        "AS"
+        "  INSERT INTO mssql_stored_proc_object([num], [str])"
+        "    VALUES(@n, @s);"
+        "  SET @id = SCOPE_IDENTITY();"
+        "  RETURN 123;");
+
+      typedef mssql::query<insert_object_id> query;
+
+      {
+        create_procedure (
+          *db, "insert_object_id_odb",
+          "(@n INT, @s VARCHAR(512))"
+          "AS"
+          "  DECLARE @id INT;"
+          "  DECLARE @ret INT;"
+          "  DECLARE @tbl TABLE(dummy INT);"
+          "  EXEC @ret = insert_object_id @n, @s, @id OUTPUT;"
+          "  SELECT @ret, @id;");
+
+        transaction t (db->begin ());
+
+        insert_object_id io (
+          db->query_value<insert_object_id> (
+            query::_val (6) + "," + query::_val ("f")));
+
+        cout << io.ret << " " << io.id << endl
+             << endl;
+
+        t.commit ();
+      }
+
+      // An alternative implementation that produces a different
+      // result set configuration at the ODBC level.
+      //
+      {
+        create_procedure (
+          *db, "insert_object_id_odb",
+          "(@n INT, @s VARCHAR(512))"
+          "AS"
+          "  DECLARE @id INT;"
+          "  DECLARE @ret INT;"
+          "  DECLARE @tbl TABLE(dummy INT);"
+          "  INSERT INTO @tbl EXEC @ret = insert_object_id @n, @s, @id OUTPUT;"
+          "  SELECT @ret, @id;");
+
+        transaction t (db->begin ());
+
+        insert_object_id io (
+          db->query_value<insert_object_id> (
+            query::_val (7) + "," + query::_val ("g")));
+
+        cout << io.ret << " " << io.id << endl
+             << endl;
+
+        t.commit ();
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/mssql/stored-proc/makefile b/mssql/stored-proc/makefile
new file mode 100644
index 0000000..f590150
--- /dev/null
+++ b/mssql/stored-proc/makefile
@@ -0,0 +1,108 @@
+# file      : mssql/stored-proc/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 := test.hxx
+genf    := $(call odb-gen,$(odb_hdr))
+gen     := $(addprefix $(out_base)/,$(genf))
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.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
+
+# 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)
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --database mssql --default-database \
+common --generate-schema --generate-query --table-prefix mssql_stored_proc_
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(subst /,-,$(subst $(src_root)/mssql/,,$(src_base)))
+$(dist): export extra_dist := $(data_dist) \
+$(name)-vc8.vcproj $(name)-vc9.vcproj \
+$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \
+$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \
+$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(data_dist))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj)
+	$(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
+	$(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
+	$(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj)
+	$(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj)
+
+# Test.
+#
+$(eval $(call test-rule))
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
+	$(call message,,rm -f $(out_base)/test.out)
+
+# 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/vc8proj.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/vc12proj.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/mssql/stored-proc/test.hxx b/mssql/stored-proc/test.hxx
new file mode 100644
index 0000000..d302630
--- /dev/null
+++ b/mssql/stored-proc/test.hxx
@@ -0,0 +1,64 @@
+// file      : mssql/stored-proc/test.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <string>
+
+#include <odb/core.hxx>
+
+#pragma db view query("SELECT SCHEMA_NAME()")
+struct default_schema
+{
+  std::string name;
+};
+
+#pragma db object
+struct object
+{
+  object () {}
+  object (unsigned int n, std::string s): num (n), str (s) {}
+
+  #pragma db id auto
+  unsigned long id;
+
+  unsigned int num;
+  std::string str;
+};
+
+#pragma db view
+struct no_result {};
+
+#pragma db view query("EXEC select_all_objects")
+struct select_all_objects
+{
+  unsigned int num;
+  std::string str;
+};
+
+#pragma db view query("EXEC select_objects (?)")
+struct select_objects
+{
+  std::string str;
+};
+
+#pragma db view query("EXEC objects_min_max_odb (?)")
+struct objects_min_max
+{
+  unsigned int num_min;
+  unsigned int num_max;
+};
+
+#pragma db view query("EXEC insert_object (?)")
+struct insert_object {};
+
+#pragma db view query("EXEC insert_object_id_odb (?)")
+struct insert_object_id
+{
+  unsigned int ret;
+  unsigned long id;
+};
+
+#endif // TEST_HXX
diff --git a/mssql/stored-proc/test.std b/mssql/stored-proc/test.std
new file mode 100644
index 0000000..6635bcc
--- /dev/null
+++ b/mssql/stored-proc/test.std
@@ -0,0 +1,17 @@
+1 a
+2 b
+3 c
+
+a
+b
+
+1 3
+
+4 d
+
+5 e
+
+123 6
+
+123 7
+
diff --git a/version b/version
index 26d9ac3..42645da 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.0.a3
+2.4.0.a4