Query support for SQL Server

5 files changed, 336 insertions, 0 deletions

diff --git a/mssql/makefile b/mssql/makefile
index 6c441ef..83b9e90 100644
--- a/mssql/makefile
+++ b/mssql/makefile
@@ -8,6 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 tests :=      \
 template      \
 native        \
+query         \
 types
 
 default   := $(out_base)/
diff --git a/mssql/query/driver.cxx b/mssql/query/driver.cxx
new file mode 100644
index 0000000..2bcd692
--- /dev/null
+++ b/mssql/query/driver.cxx
@@ -0,0 +1,189 @@
+// file      : mssql/query/driver.cxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test SQL Server-specific query support aspects.
+//
+
+#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;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    {
+      object o1;
+      object o2;
+      object o3;
+
+      o1.num = 1;
+      o1.str = "aaa";
+      o1.nstr = L"aaa";
+      o1.lstr.assign (1024, 'a');
+      o1.lnstr.assign (1024, L'a');
+      o1.smoney = 11000;
+      o1.money = 1.1;
+
+      o2.num = 2;
+      o2.str = "bbb";
+      o2.nstr = L"bbb";
+      o2.lstr.assign (1024, 'b');
+      o2.lnstr.assign (1024, L'b');
+      o2.smoney = 22000;
+      o2.money = 2.2;
+
+      o3.num = 3;
+      o3.str = "ccc";
+      o3.nstr = L"ccc";
+      o3.lstr.assign (1024, 'c');
+      o3.lnstr.assign (1024, L'c');
+      o3.smoney = 33000;
+      o3.money = 3.3;
+
+      transaction t (db->begin ());
+      db->persist (o1);
+      db->persist (o2);
+      db->persist (o3);
+      t.commit ();
+    }
+
+    typedef odb::query<object> query;
+    typedef odb::result<object> result;
+
+    {
+      transaction t (db->begin ());
+
+      // Money and small money.
+      //
+      {
+        result r (db->query<object> (query::smoney < 22000));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->smoney == 11000);
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> ("smoney < " + query::_val (2.1F)));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->smoney == 11000);
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> (query::money < 2.2));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->money == 1.1);
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> ("money < " + query::_val (2.2)));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->money == 1.1);
+        assert (++i == r.end ());
+      }
+
+      // Short/long string.
+      //
+      {
+        result r (db->query<object> (query::str < "bbb"));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->str == "aaa");
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> ("str < " + query::_val ("bbb", 3)));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->str == "aaa");
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> (query::nstr < L"bbb"));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->nstr == L"aaa");
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> (query::lstr < string (1024, 'b')));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->lstr == string (1024, 'a'));
+        assert (++i == r.end ());
+      }
+
+      {
+        string v (1024, 'b');
+        result r (db->query<object> (query::lstr < query::_ref (v)));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->lstr == string (1024, 'a'));
+        assert (++i == r.end ());
+      }
+
+      {
+        result r (db->query<object> (query::lnstr < wstring (1024, L'b')));
+        result::iterator i (r.begin ());
+        assert (i != r.end ());
+        assert (i->lnstr == wstring (1024, L'a'));
+        assert (++i == r.end ());
+      }
+
+      // Test image copying with long data.
+      //
+      {
+        result r (db->query<object> (query::str < "ccc"));
+        result::iterator i (r.begin ());
+
+        assert (i != r.end ());
+        ++i;
+        assert (i != r.end ());
+
+        {
+          result r (db->query<object> (query::str < "bbb"));
+          result::iterator i (r.begin ());
+          assert (i != r.end ());
+          assert (i->str == "aaa");
+          assert (++i == r.end ());
+        }
+
+        assert (i->str == "bbb"); // Load from copy.
+        assert (++i == r.end ());
+      }
+
+      t.commit ();
+    }
+
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/mssql/query/makefile b/mssql/query/makefile
new file mode 100644
index 0000000..808e48d
--- /dev/null
+++ b/mssql/query/makefile
@@ -0,0 +1,106 @@
+# file      : mssql/query/makefile
+# author    : Constantin Michael <constantin@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 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
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+
+# 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)
+
+genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --database mssql --generate-schema \
+--generate-query --table-prefix mssql_query_
+$(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)-vc9.vcproj \
+$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(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 schema)
+	$(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))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(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/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(odb_rules))
+$(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/query/test.hxx b/mssql/query/test.hxx
new file mode 100644
index 0000000..964d893
--- /dev/null
+++ b/mssql/query/test.hxx
@@ -0,0 +1,40 @@
+// file      : mssql/query/test.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 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 object
+struct object
+{
+  #pragma db id auto
+  unsigned long id_;
+
+  unsigned int num;
+
+  #pragma db type ("SMALLMONEY")
+  int smoney;
+
+  #pragma db type ("MONEY")
+  double money;
+
+  #pragma db type ("VARCHAR(256)")
+  std::string str;
+
+  #pragma db type ("NVARCHAR(128)")
+  std::wstring nstr;
+
+  #pragma db type ("VARCHAR(max)")
+  std::string lstr;
+
+  #pragma db type ("NVARCHAR(max)")
+  std::wstring lnstr;
+};
+
+#endif // TEST_HXX
diff --git a/mssql/query/test.std b/mssql/query/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mssql/query/test.std