SNOW-27328: region parameter doesn't work

Author: smtakeda

connection.py

@@ -23,7 +23,7 @@
                      DatabaseError)
 from .sqlstate import (SQLSTATE_CONNECTION_NOT_EXISTS,
                        SQLSTATE_FEATURE_NOT_SUPPORTED)
-from .util_text import split_statements
+from .util_text import split_statements, construct_hostname
 
 try:
     import snowflake.internal.constants
@@ -478,13 +478,9 @@ def __config(self, **kwargs):
 
         if u'account' in kwargs and kwargs[u'account'] not in TEST_ACCOUNTS:
             if u'host' not in kwargs:
-                if kwargs.get(u'region'):
-                    host = u'{0}.{1}.snowflakecomputing.com'.format(
-                        self._account[0:self._account.find(u'.')],
-                        kwargs.get(u'region'))
-                else:
-                    host = u'{0}.snowflakecomputing.com'.format(self._account)
-                setattr(self, u'_host', host)
+                setattr(self, u'_host',
+                        construct_hostname(
+                            kwargs.get(u'region'), self._account))
             if u'port' not in kwargs:
                 setattr(self, u'_port', u'443')
             if u'protocol' not in kwargs:

converter_snowsql.py

@@ -108,7 +108,7 @@ def _DATE_to_python(self, value, ctx):
         try:
             t = ZERO_EPOCH + timedelta(seconds=int(value) * (24 * 60 * 60))
             if fmt:
-                return fmt.format(t)
+                return fmt.format(SnowflakeDateTime(t, nanosecond=0))
             return TO_UNICODE(date(t.year, t.month, t.day))
         except OverflowError:
             self.logger.debug(
@@ -117,9 +117,7 @@ def _DATE_to_python(self, value, ctx):
                 value)
             t = time.gmtime(value)
             if fmt:
-                return fmt.format(
-                    SnowflakeDateTime(t, nanosecond=0)
-                )
+                return fmt.format(SnowflakeDateTime(t, nanosecond=0))
             return u'{year:d}-{month:02d}-{day:02d}'.format(
                 year=t.tm_year, month=t.tm_mon, day=t.tm_mday)
 

test/test_unit_construct_hostname.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2017 Snowflake Computing Inc. All right reserved.
+#
+
+from snowflake.connector.util_text import construct_hostname
+
+
+def test_construct_hostname_basic():
+    assert construct_hostname('eu-central-1', 'account1') == \
+           'account1.eu-central-1.snowflakecomputing.com'
+
+    assert construct_hostname('', 'account1') == \
+           'account1.snowflakecomputing.com'
+
+    assert construct_hostname(None, 'account1') == \
+           'account1.snowflakecomputing.com'
+
+    assert construct_hostname('as-east-3', 'account1') == \
+           'account1.as-east-3.snowflakecomputing.com'
+
+    assert construct_hostname('as-east-3', 'account1.eu-central-1') == \
+           'account1.as-east-3.snowflakecomputing.com'
+
+    assert construct_hostname('', 'account1.eu-central-1') == \
+           'account1.eu-central-1.snowflakecomputing.com'
+
+    assert construct_hostname(None, 'account1.eu-central-1') == \
+           'account1.eu-central-1.snowflakecomputing.com'

test/test_unit_split_statement.py

@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2017 Snowflake Computing Inc. All right reserved.
+#
 from io import StringIO
 
 import pytest

util_text.py

@@ -180,3 +180,16 @@ def split_rows_from_stream(stream):
                 row.append(value)
         elif event == 'start_array':
             in_row = True
+
+
+def construct_hostname(region, account):
+    """
+    Constructs hostname from region and account
+    """
+    if region:
+        if account.find(u'.') > 0:
+            account = account[0:account.find(u'.')]
+        host = u'{0}.{1}.snowflakecomputing.com'.format(account, region)
+    else:
+        host = u'{0}.snowflakecomputing.com'.format(account)
+    return host