SNOW-66722: Fixed regression for DATE format in Windows

Author: smtakeda

converter_snowsql.py

@@ -5,12 +5,12 @@
 #
 
 import time
-from datetime import timedelta, datetime
+from datetime import timedelta, datetime, date
 from logging import getLogger
 
 import pytz
 
-from .compat import TO_UNICODE
+from .compat import TO_UNICODE, IS_WINDOWS
 from .constants import (is_timestamp_type_name, is_date_type_name)
 from .converter import (SnowflakeConverter, ZERO_EPOCH, _extract_timestamp)
 from .sfbinaryformat import (binary_to_python, SnowflakeBinaryFormat)
@@ -72,10 +72,11 @@ def to_python_method(self, type_name, column):
             ctx['zero_fill'] = '0' * (9 - ctx['scale'])
         fmt = None
         if is_date_type_name(type_name):
+            datetime_class = time.struct_time if not IS_WINDOWS else date
             fmt = SnowflakeDateFormat(
                 self._get_format(type_name),
                 support_negative_year=self._support_negative_year,
-                datetime_class=time.struct_time)
+                datetime_class=datetime_class)
         elif is_timestamp_type_name(type_name):
             fmt = SnowflakeDateTimeFormat(
                 self._get_format(type_name),
@@ -121,14 +122,19 @@ def _BINARY_to_python(self, ctx):
 
     def _DATE_to_python(self, ctx):
         """
-        DATE to datetime
+        DATE to struct_time/date
 
         No timezone is attached.
         """
+
         def conv(value):
             return ctx['fmt'].format(time.gmtime(int(value) * (24 * 60 * 60)))
 
-        return conv
+        def conv_windows(value):
+            ts = ZERO_EPOCH + timedelta(seconds=int(value) * (24 * 60 * 60))
+            return ctx['fmt'].format(date(ts.year, ts.month, ts.day))
+
+        return conv if not IS_WINDOWS else conv_windows
 
     def _TIMESTAMP_TZ_to_python(self, ctx):
         """

sfdatetime.py

@@ -3,9 +3,10 @@
 #
 # Copyright (c) 2012-2018 Snowflake Computing Inc. All right reserved.
 #
-import time
 from collections import namedtuple
-from datetime import timedelta, datetime
+
+import time
+from datetime import timedelta, datetime, date
 
 from .compat import TO_UNICODE
 
@@ -79,6 +80,11 @@ def _build_raw_year_format(year_raw_value, year_len):
     return fmt.format(year_raw_value)
 
 
+def _support_negative_year_date(value, year_len):
+    # if YYYY/YY is included
+    return _build_year_format(value, year_len)
+
+
 def _inject_fraction(value, fraction_len):
     # if FF is included
     nano_str = u'{:09d}'
@@ -112,6 +118,7 @@ def _inject_others(_, value0):
     _support_negative_year,
     _support_negative_year_datetime,
     _support_negative_year_struct_time,
+    _support_negative_year_date,
     _inject_fraction
 }
 
@@ -134,6 +141,8 @@ def __init__(
             self._support_negative_year_method = _support_negative_year_datetime
         elif datetime_class == time.struct_time:
             self._support_negative_year_method = _support_negative_year_struct_time
+        elif datetime_class == date:
+            self._support_negative_year_method = _support_negative_year_date
         else:
             self._support_negative_year_method = _support_negative_year
 
@@ -350,3 +359,7 @@ def _format_struct_time(self, value):
         """
         fmt = self._pre_format(value)
         return TO_UNICODE(time.strftime(fmt, value))
+
+    def _format_date(self, value):
+        fmt = self._pre_format(value)
+        return value.strftime(fmt)

test/test_converter.py

@@ -344,6 +344,33 @@ def test_fetch_timestamps_negative_epoch(conn_cnx):
         assert ret[1] == r1
 
 
+def test_date_0001_9999(conn_cnx):
+    """
+    Test 0001 and 9999 for all platforms
+    """
+    with conn_cnx(
+            converter_class=SnowflakeConverterSnowSQL,
+            support_negative_year=True) as cnx:
+        cnx.cursor().execute("""
+ALTER SESSION SET
+    DATE_OUTPUT_FORMAT='YYYY-MM-DD'
+""")
+        cur = cnx.cursor()
+        cur.execute("""
+SELECT
+    DATE_FROM_PARTS(1900, 1, 1),
+    DATE_FROM_PARTS(2500, 2, 3),
+    DATE_FROM_PARTS(1, 10, 31),
+    DATE_FROM_PARTS(9999, 3, 20)
+    ;
+""")
+        ret = cur.fetchone()
+        assert ret[0] == '1900-01-01'
+        assert ret[1] == '2500-02-03'
+        assert ret[2] == '0001-10-31'
+        assert ret[3] == '9999-03-20'
+
+
 @pytest.mark.skipif(PY2 or IS_WINDOWS, reason="year out of range error")
 def test_five_or_more_digit_year_date_converter(conn_cnx):
     """