Thread: [SQL-CVS] r1492 - in SQLObject/trunk/sqlobject: . tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2006-01-11 20:57:45
|
Author: phd Date: 2006-01-11 13:57:41 -0700 (Wed, 11 Jan 2006) New Revision: 1492 Modified: SQLObject/trunk/sqlobject/converters.py SQLObject/trunk/sqlobject/tests/test_converters.py Log: Recommitted patches that I have erroneously committed to to the old repository. Modified: SQLObject/trunk/sqlobject/converters.py =================================================================== --- SQLObject/trunk/sqlobject/converters.py 2006-01-11 20:57:23 UTC (rev 1491) +++ SQLObject/trunk/sqlobject/converters.py 2006-01-11 20:57:41 UTC (rev 1492) @@ -189,20 +189,22 @@ if datetime: def DateTimeConverter(value, db): - return value.strftime("'%Y-%m-%d %H:%M:%S'") + return "'%4d-%02d-%02d %02d:%02d:%02d'" % ( + value.year, value.month, value.day, + value.hour, value.minute, value.second) registerConverter(datetime.datetime, DateTimeConverter) + def DateConverter(value, db): + return "'%4d-%02d-%02d'" % (value.year, value.month, value.day) + + registerConverter(datetime.date, DateConverter) + def TimeConverter(value, db): - return value.strftime("'%H:%M:%S'") + return "'%02d:%02d:%02d'" % (value.hour, value.minute, value.second) registerConverter(datetime.time, TimeConverter) - def DateConverter(value, db): - return value.strftime("'%Y-%m-%d'") - - registerConverter(datetime.date, DateConverter) - if Decimal: def DecimalConverter(value, db): return value.to_eng_string() Modified: SQLObject/trunk/sqlobject/tests/test_converters.py =================================================================== --- SQLObject/trunk/sqlobject/tests/test_converters.py 2006-01-11 20:57:23 UTC (rev 1491) +++ SQLObject/trunk/sqlobject/tests/test_converters.py 2006-01-11 20:57:41 UTC (rev 1492) @@ -82,6 +82,15 @@ assert sqlrepr(TRUE, 'mysql') == "1" assert sqlrepr(FALSE, 'mysql') == "0" +def test_datetime(): + from datetime import datetime, date, time + assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02'" + assert sqlrepr(date(2005, 7, 14)) == "'2005-07-14'" + assert sqlrepr(time(13, 31, 2)) == "'13:31:02'" + # now dates before 1900 + assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02'" + assert sqlrepr(date(1428, 7, 14)) == "'1428-07-14'" + def test_instance(): instance = TestClass() assert sqlrepr(instance) == repr(instance) |