Merge pull request pymssql#398 from pymssql/pr331-date-time-datetime2

Add suport for date, time and datetime2

Author: ramiro

ChangeLog

@@ -14,7 +14,15 @@ General
 Features
 --------
 
-TBA
+- Support for new in SQL Server 2008 ``DATE``, ``TIME`` and ``DATETIME2`` data
+  types (GH-156). The following conditions need to be additionally met so
+  values of these column types can be returned from the database as their
+  native corresponding Python data types instead of as strings:
+
+  * Underlying FreeTDS must be 0.95 or newer.
+  * TDS protocol version in use must be 7.3 or newer.
+
+  Thanks Ed Avis for the implementation. (GH-331)
 
 Bug fixes
 ---------

ChangeLog_highlights.rst

@@ -12,7 +12,15 @@ General
 Features
 --------
 
-TBA
+- Support for new in SQL Server 2008 ``DATE``, ``TIME`` and ``DATETIME2`` data
+  types (GH-156). The following conditions need to be additionally met so
+  values of these column types can be returned from the database as their
+  native corresponding Python data types instead of as strings:
+
+  * Underlying FreeTDS must be 0.95 or newer.
+  * TDS protocol version in use must be 7.3 or newer.
+
+  Thanks Ed Avis for the implementation. (GH-331)
 
 Bug fixes
 ---------

docs/faq.rst

@@ -264,22 +264,17 @@ and ``TIME`` columns as simple strings. For example::
 
 Yep, so the problem here is that ``DATETIME`` has been supported by `FreeTDS
 <http://www.freetds.org/>`_ for a long time, but ``DATE`` and ``TIME`` are
-newer types in SQL Server and Microsoft never added support for them to db-lib
-and FreeTDS never added support for them either.
+newer types in SQL Server, Microsoft never added support for them to db-lib
+and FreeTDS added support for them in version 0.95.
 
-There was some discussion of adding it to FreeTDS, but I think that stalled.
-See this thread:
+If you need support for these data types (i.e. they get returned from the
+database as their native corresponding Python data types instead of as strings)
+as well as for the ``DATETIME2`` one, then make sure the following conditions
+are met:
 
-http://lists.ibiblio.org/pipermail/freetds/2013q2/thread.html#28348
-
-So we would need to get FreeTDS to support it and then the user would have to
-make sure to use a very recent FreeTDS (unless pymssql links in said version of
-FreeTDS).
-
-Links:
-
-* https://github.com/pymssql/pymssql/issues/156
-* `Discussion of adding support for DATE and TIME to FreeTDS <http://lists.ibiblio.org/pipermail/freetds/2013q2/thread.html#28348>`_
+* You are connecting to SQL Server 2008 or newer.
+* You are using FreeTDS 0.95 or newer.
+* You are using TDS protocol version 7.3 or newer.
 
 Shared object "libsybdb.so.3" not found
 =======================================

src/_mssql.pyx

@@ -132,6 +132,10 @@ SQLVARBINARY = SYBVARBINARY
 SQLVARCHAR = SYBVARCHAR
 SQLUUID = 36
 
+SQLDATE = 40
+SQLTIME = 41
+SQLDATETIME2 = 42
+
 #######################
 ## Exception classes ##
 #######################
@@ -800,13 +804,25 @@ cdef class MSSQLConnection:
                 ctx.prec = precision if precision > 0 else 1
                 return decimal.Decimal(_remove_locale(buf, converted_length).decode(self._charset))
 
-        elif dbtype == SQLDATETIM4:
+        elif dbtype in (SQLDATETIM4, SQLDATETIME2):
             dbconvert(self.dbproc, dbtype, data, -1, SQLDATETIME,
                 <BYTE *>&dt, -1)
             dbdatecrack(self.dbproc, &di, <DBDATETIME *><BYTE *>&dt)
             return datetime.datetime(di.year, di.month, di.day,
                 di.hour, di.minute, di.second, di.millisecond * 1000)
 
+        elif dbtype == SQLDATE:
+            dbconvert(self.dbproc, dbtype, data, -1, SQLDATETIME,
+                <BYTE *>&dt, -1)
+            dbdatecrack(self.dbproc, &di, <DBDATETIME *><BYTE *>&dt)
+            return datetime.date(di.year, di.month, di.day)
+
+        elif dbtype == SQLTIME:
+            dbconvert(self.dbproc, dbtype, data, -1, SQLDATETIME,
+                <BYTE *>&dt, -1)
+            dbdatecrack(self.dbproc, &di, <DBDATETIME *><BYTE *>&dt)
+            return datetime.time(di.hour, di.minute, di.second, di.millisecond * 1000)
+
         elif dbtype == SQLDATETIME:
             dbdatecrack(self.dbproc, &di, <DBDATETIME *>data)
             return datetime.datetime(di.year, di.month, di.day,

tests/test_types.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import binascii
+from datetime import time
+from datetime import date
 from datetime import datetime
 import decimal
 from decimal import Decimal as D
@@ -9,7 +11,9 @@
 import unittest
 import uuid
 
-from .helpers import skip_test
+from .helpers import get_sql_server_version
+
+import pytest
 
 
 def get_bytes_buffer():
@@ -34,6 +38,9 @@ def typeeq(v1, v2):
     float_no float,
     money_no money,
     stamp_datetime datetime,
+    stamp_date date,
+    stamp_time time,
+    stamp_datetime2 datetime2,
     data_bit bit,
     comment_vch varchar(50),
     comment_nvch nvarchar(50),
@@ -44,7 +51,7 @@ def typeeq(v1, v2):
     decimal_no decimal(38,2),
     decimal_no2 decimal(38,10),
     numeric_no numeric(38,8),
-    stamp_time timestamp,
+    stamp_timestamp timestamp,
     uuid uniqueidentifier
 )
 """
@@ -156,6 +163,37 @@ def test_datetime_params_as_dict(self):
         typeeq(testval, colval)
         eq_(testval, colval)
 
+    def test_date(self):
+        if get_sql_server_version(self.conn) < 2008:
+            pytest.skip("DATE field type isn't supported by SQL Server versions prior to 2008.")
+        if self.conn.tds_version < 7.3:
+            pytest.skip("DATE field type isn't supported by TDS protocol older than 7.3.")
+        testval = date(2013, 1, 2)
+        colval = self.insert_and_select('stamp_date', testval, 's')
+        typeeq(testval, colval)
+        eq_(testval, colval)
+
+    def test_time(self):
+        if get_sql_server_version(self.conn) < 2008:
+            pytest.skip("TIME field type is supported by SQL Server versions prior to 2008.")
+        if self.conn.tds_version < 7.3:
+            pytest.skip("TIME field type isn't supported by TDS protocol older than 7.3.")
+        testval = datetime(2013, 1, 2, 3, 4, 5, 3000)
+        colval = self.insert_and_select('stamp_time', testval, 's')
+        testval_no_date = testval.time()
+        typeeq(testval_no_date, colval)
+        eq_(testval_no_date, colval)
+
+    def test_datetime2(self):
+        if get_sql_server_version(self.conn) < 2008:
+            pytest.skip("DATETIME2 field type isn't supported by SQL Server versions prior to 2008.")
+        if self.conn.tds_version < 7.3:
+            pytest.skip("DATETIME2 field type isn't supported by TDS protocol older than 7.3.")
+        testval = datetime(2013, 1, 2, 3, 4, 5, 3000)
+        colval = self.insert_and_select('stamp_datetime2', testval, 's')
+        typeeq(testval, colval)
+        eq_(testval, colval)
+
     def test_decimal(self):
         # test rounding down
         origval = D('1.2345')