From 092163ffe44f64387508a0770948636f79ae139d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 18 Jan 2012 14:34:06 +0200
Subject: Add support for configuring test suite with additional macros
---
mssql/types/driver.cxx | 8 ++++++++
mssql/types/test.hxx | 34 +++++++++++++++++++++-------------
2 files changed, 29 insertions(+), 13 deletions(-)
(limited to 'mssql')
diff --git a/mssql/types/driver.cxx b/mssql/types/driver.cxx
index 3cef5ad..db814e2 100644
--- a/mssql/types/driver.cxx
+++ b/mssql/types/driver.cxx
@@ -78,14 +78,18 @@ main (int argc, char* argv[])
o.mvbin_.assign (ldata.begin (), ldata.end ());
o.image_.assign (ldata.begin (), ldata.end ());
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
o.date_ = date_time (2011, 12, 20, 0, 0, 0, 0, 0, 0);
o.time7_ = date_time (0, 0, 0, 13, 34, 39, 123456789, 0, 0);
o.time4_ = date_time (0, 0, 0, 13, 34, 39, 123456700, 0, 0);
+#endif
o.sdt_ = date_time (2011, 12, 20, 15, 44, 29, 123456700, 0, 0);
o.dt_ = date_time (2011, 12, 20, 15, 44, 29, 123456700, 0, 0);
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
o.dt2_ = date_time (2011, 12, 20, 15, 44, 29, 123456700, 0, 0);
o.dto7_ = date_time (2011, 12, 20, 15, 44, 29, 123456700, 2, 0);
o.dto0_ = date_time (2011, 12, 20, 15, 44, 29, 123456700, 2, 0);
+#endif
#ifdef _WIN32
// 6F846D41-C89A-4E4D-B22F-56443CFA543F
@@ -103,11 +107,15 @@ main (int argc, char* argv[])
t.commit ();
}
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
o.time7_ = date_time (0, 0, 0, 13, 34, 39, 123456700, 0, 0);
o.time4_ = date_time (0, 0, 0, 13, 34, 39, 123400000, 0, 0);
+#endif
o.sdt_ = date_time (2011, 12, 20, 15, 44, 0, 0, 0, 0);
o.dt_ = date_time (2011, 12, 20, 15, 44, 29, 123000000, 0, 0);
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
o.dto0_ = date_time (2011, 12, 20, 15, 44, 29, 0, 2, 0);
+#endif
// Load.
//
diff --git a/mssql/types/test.hxx b/mssql/types/test.hxx
index 7653ec6..57bc7b2 100644
--- a/mssql/types/test.hxx
+++ b/mssql/types/test.hxx
@@ -11,7 +11,7 @@
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h> // GUID
-#elif defined(WIN32_CROSS)
+#elif defined(HOST_WIN32)
typedef struct _GUID
{
unsigned int Data1;
@@ -205,8 +205,9 @@ struct object
#pragma db type ("IMAGE")
std::vector<char> image_;
- // Date-time.
+ // Date-time. SQL Server 2005 (9.0) only has DATETIME and SMALLDATETIME.
//
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
#pragma db type ("DATE")
date_time date_;
@@ -215,6 +216,7 @@ struct object
#pragma db type ("TIME(4)")
date_time time4_;
+#endif
#pragma db type ("SMALLDATETIME")
date_time sdt_;
@@ -222,6 +224,7 @@ struct object
#pragma db type ("DATETIME")
date_time dt_;
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
#pragma db type ("DATETIME2")
date_time dt2_;
@@ -230,10 +233,11 @@ struct object
#pragma db type ("DATETIMEOFFSET(0)")
date_time dto0_;
+#endif
// Other types.
//
-#if defined(_WIN32) || defined(WIN32_CROSS)
+#if defined(_WIN32) || defined(HOST_WIN32)
//#pragma db type ("UNIQUEIDENTIFIER")
GUID guid_;
#endif
@@ -280,16 +284,20 @@ struct object
std::memcmp (lbin_, y.lbin_, sizeof (lbin_)) == 0 &&
lvbin_ == y.lvbin_ &&
mvbin_ == y.mvbin_ &&
- image_ == y.image_ &&
-
- date_ == y.date_ &&
- time7_ == y.time7_ &&
- time4_ == y.time4_ &&
- sdt_ == y.sdt_ &&
- dt_ == y.dt_ &&
- dt2_ == y.dt2_ &&
- dto7_ == y.dto7_ &&
- dto0_ == y.dto0_
+ image_ == y.image_
+
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
+ && date_ == y.date_
+ && time7_ == y.time7_
+ && time4_ == y.time4_
+#endif
+ && sdt_ == y.sdt_
+ && dt_ == y.dt_
+#if !defined(MSSQL_SERVER_VERSION) || MSSQL_SERVER_VERSION >= 1000
+ && dt2_ == y.dt2_
+ && dto7_ == y.dto7_
+ && dto0_ == y.dto0_
+#endif
#ifdef _WIN32
&& std::memcmp (&guid_, &y.guid_, sizeof (guid_)) == 0
--
cgit v1.1