Changeset: 4066c5891f27 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4066c5891f27
Modified Files:
clients/python2/monetdb/sql/pythonize.py
clients/python2/test/capabilities.py
clients/python3/monetdb/sql/pythonize.py
clients/python3/test/capabilities.py
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
Branch: Jan2014
Log Message:
TIMETZ has a fraction, whereas TIME does not.
Also actually run both TIME and TIMETZ tests.
diffs (88 lines):
diff --git a/clients/python2/monetdb/sql/pythonize.py
b/clients/python2/monetdb/sql/pythonize.py
--- a/clients/python2/monetdb/sql/pythonize.py
+++ b/clients/python2/monetdb/sql/pythonize.py
@@ -59,7 +59,7 @@ def py_timetz(data):
""" returns a python Time where data contains a tz code
"""
t, timezone_delta = _extract_timezone(data)
- return (datetime.datetime.strptime(t, '%H:%M:%S') + timezone_delta).time()
+ return (datetime.datetime.strptime(t, '%H:%M:%S.%f') +
timezone_delta).time()
def py_date(data):
diff --git a/clients/python2/test/capabilities.py
b/clients/python2/test/capabilities.py
--- a/clients/python2/test/capabilities.py
+++ b/clients/python2/test/capabilities.py
@@ -241,7 +241,7 @@ class DatabaseTest(unittest.TestCase):
('col1 TIME',),
generator)
- def test_TIME(self):
+ def test_TIMETZ(self):
ticks = time()
def generator(row,col):
return self.db_module.TimeFromTicks(ticks+row*86400-col*1313)
diff --git a/clients/python3/monetdb/sql/pythonize.py
b/clients/python3/monetdb/sql/pythonize.py
--- a/clients/python3/monetdb/sql/pythonize.py
+++ b/clients/python3/monetdb/sql/pythonize.py
@@ -63,7 +63,7 @@ def py_timetz(data):
""" returns a python Time where data contains a tz code
"""
t, timezone_delta = _extract_timezone(data)
- return (datetime.datetime.strptime(t, '%H:%M:%S') + timezone_delta).time()
+ return (datetime.datetime.strptime(t, '%H:%M:%S.%f') +
timezone_delta).time()
def py_date(data):
diff --git a/clients/python3/test/capabilities.py
b/clients/python3/test/capabilities.py
--- a/clients/python3/test/capabilities.py
+++ b/clients/python3/test/capabilities.py
@@ -241,7 +241,7 @@ class DatabaseTest(unittest.TestCase):
('col1 TIME',),
generator)
- def test_TIME(self):
+ def test_TIMETZ(self):
ticks = time()
def generator(row,col):
return self.db_module.TimeFromTicks(ticks+row*86400-col*1313)
diff --git a/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
--- a/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
+++ b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
@@ -93,6 +93,7 @@ test_TEXT (__main__.Test_Capabilities) .
test_TIME (__main__.Test_Capabilities) ... ok
test_TIMESTAMP (__main__.Test_Capabilities) ... ok
test_TIMESTAMPTZ (__main__.Test_Capabilities) ... ok
+test_TIMETZ (__main__.Test_Capabilities) ... ok
test_TINYINT (__main__.Test_Capabilities) ... ok
test_URL (__main__.Test_Capabilities) ... ok
test_bigresult (__main__.Test_Capabilities) ... ok
@@ -106,7 +107,7 @@ test_transactions (__main__.Test_Capabil
test_truncation (__main__.Test_Capabilities) ... ok
----------------------------------------------------------------------
-Ran 25 tests
+Ran 26 tests
OK
test_BINARY (__main__.Test_DBAPI20) ... ok
diff --git a/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
--- a/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
+++ b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
@@ -93,6 +93,7 @@ test_TEXT (__main__.Test_Capabilities) .
test_TIME (__main__.Test_Capabilities) ... ok
test_TIMESTAMP (__main__.Test_Capabilities) ... ok
test_TIMESTAMPTZ (__main__.Test_Capabilities) ... ok
+test_TIMETZ (__main__.Test_Capabilities) ... ok
test_TINYINT (__main__.Test_Capabilities) ... ok
test_URL (__main__.Test_Capabilities) ... ok
test_bigresult (__main__.Test_Capabilities) ... ok
@@ -106,7 +107,7 @@ test_transactions (__main__.Test_Capabil
test_truncation (__main__.Test_Capabilities) ... ok
----------------------------------------------------------------------
-Ran 25 tests
+Ran 26 tests
OK
test_BINARY (__main__.Test_DBAPI20) ... ok
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
