psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-26 13:40:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cast datetime into timestamptz when the tzinfo field is set.

Browse Source
This commit is contained in:
Daniele Varrazzo 2010-05-05 00:53:15 +01:00
parent 60e7522e47
commit 5e3f240ac9
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
psycopg/adapter_datetime.c
View File

@ -57,6 +57,7 @@ static PyObject *
pydatetime_str(pydatetimeObject *self) pydatetime_str(pydatetimeObject *self)
{ {
if (self->type <= PSYCO_DATETIME_TIMESTAMP) { if (self->type <= PSYCO_DATETIME_TIMESTAMP) {
PyObject *tz;
/* Select the right PG type to cast into. */ /* Select the right PG type to cast into. */
char *fmt = NULL; char *fmt = NULL;
@ -68,7 +69,10 @@ pydatetime_str(pydatetimeObject *self)
fmt = "'%s'::date"; fmt = "'%s'::date";
break; break;
case PSYCO_DATETIME_TIMESTAMP: case PSYCO_DATETIME_TIMESTAMP:
fmt = "'%s'::timestamp"; tz = PyObject_GetAttrString(self->wrapped, "tzinfo");
if (!tz) { return NULL; }
fmt = (tz == Py_None) ? "'%s'::timestamp" : "'%s'::timestamptz";
Py_DECREF(tz);
break; break;
} }

13
tests/test_dates.py
View File

@ -250,6 +250,7 @@ class DatetimeTests(unittest.TestCase, CommonDatetimeTestsMixin):
def _test_type_roundtrip(self, o1): def _test_type_roundtrip(self, o1):
o2 = self.execute("select %s;", (o1,)) o2 = self.execute("select %s;", (o1,))
self.assertEqual(type(o1), type(o2)) self.assertEqual(type(o1), type(o2))
return o2
def _test_type_roundtrip_array(self, o1): def _test_type_roundtrip_array(self, o1):
o1 = [o1] o1 = [o1]
@ -262,7 +263,17 @@ class DatetimeTests(unittest.TestCase, CommonDatetimeTestsMixin):
def test_type_roundtrip_datetime(self): def test_type_roundtrip_datetime(self):
from datetime import datetime from datetime import datetime
self._test_type_roundtrip(datetime(2010,05,03,10,20,30)) dt = self._test_type_roundtrip(datetime(2010,05,03,10,20,30))
self.assertEqual(None, dt.tzinfo)
def test_type_roundtrip_datetimetz(self):
from datetime import datetime
import psycopg2.tz
tz = psycopg2.tz.FixedOffsetTimezone(8*60)
dt1 = datetime(2010,05,03,10,20,30, tzinfo=tz)
dt2 = self._test_type_roundtrip(dt1)
self.assertNotEqual(None, dt2.tzinfo)
self.assertEqual(dt1, dt2)
def test_type_roundtrip_time(self): def test_type_roundtrip_time(self):
from datetime import time from datetime import time