From 4233e9a4acfafdb5bb4a5a86d7a15ddbe17d330b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 24 Nov 2014 15:51:28 +0200
Subject: Tie various loose ends

---
 odb/relational/mssql/source.cxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/odb/relational/mssql/source.cxx b/odb/relational/mssql/source.cxx
index e40a189..ffcfa3c 100644
--- a/odb/relational/mssql/source.cxx
+++ b/odb/relational/mssql/source.cxx
@@ -920,7 +920,7 @@ namespace relational
               sql_type::ROWVERSION)
             return r;
 
-          // Long data & SQL Server 2005 incompatibility is detected
+          // ROWVERSION & SQL Server 2005 incompatibility is detected
           // in persist_statement_extra.
           //
           r = "OUTPUT INSERTED." +
@@ -1037,6 +1037,16 @@ namespace relational
                   throw operation_failed ();
                 }
 
+                // We also cannot support bulk INSERT.
+                //
+                if (c.count ("bulk-persist"))
+                {
+                  error (c.location ()) << "in SQL Server 2005 bulk " <<
+                    "persist operation cannot be implemented for a " <<
+                    "persistent class containing long data" << endl;
+                  throw operation_failed ();
+                }
+
                 r = "; SELECT " + convert_from ("SCOPE_IDENTITY()", *id);
               }
 
-- 
cgit v1.1