From cf1a44f4b9b76077e290d5314ab46242ae8f342a Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Fri, 24 Jul 2009 23:34:25 +0000 Subject: [PATCH] revert r6184, toggle the jdbc driver's yearIsDateType option instead --- lib/sqlalchemy/dialects/mysql/zxjdbc.py | 2 +- test/dialect/test_mysql.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/dialects/mysql/zxjdbc.py b/lib/sqlalchemy/dialects/mysql/zxjdbc.py index 66840f063a..3ffe85f831 100644 --- a/lib/sqlalchemy/dialects/mysql/zxjdbc.py +++ b/lib/sqlalchemy/dialects/mysql/zxjdbc.py @@ -46,7 +46,7 @@ class MySQL_jdbc(ZxJDBCConnector, MySQLDialect): def _driver_kwargs(self): """return kw arg dict to be sent to connect().""" - return {'CHARSET':self.encoding} + return dict(CHARSET=self.encoding, yearIsDateType='false') def _extract_error_code(self, exception): # e.g.: DBAPIError: (Error) Table 'test.u2' doesn't exist diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py index c313a2f746..55792274a8 100644 --- a/test/dialect/test_mysql.py +++ b/test/dialect/test_mysql.py @@ -1,4 +1,3 @@ -import datetime from sqlalchemy.test.testing import eq_ # Py2K @@ -466,12 +465,7 @@ class TypesTest(TestBase, AssertsExecutionResults): for table in year_table, reflected: table.insert(['1950', '50', None, 50, 1950]).execute() row = table.select().execute().first() - if testing.against('+zxjdbc'): - expected = [datetime.date(1950, 1, 1), datetime.date(2050, 1, 1), None, - datetime.date(2050, 1, 1), datetime.date(1950, 1, 1)] - else: - expected = [1950, 2050, None, 50, 1950] - eq_(list(row), expected) + eq_(list(row), [1950, 2050, None, 50, 1950]) table.delete().execute() self.assert_(colspec(table.c.y1).startswith('y1 YEAR')) eq_(colspec(table.c.y4), 'y4 YEAR(2)') -- 2.47.3