From: Jason Kirtland <jek@discorporate.us>
Date: Mon, 10 Sep 2007 22:32:11 +0000 (+0000)
Subject: added support for string date passthru in sqlite (merge of r3322 from trunk)
X-Git-Tag: rel_0_3_11~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3917a84f005a23e5bea618c520ad6fd0617139da;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

added support for string date passthru in sqlite (merge of r3322 from trunk)
---

diff --git a/CHANGES b/CHANGES
index ef50caf4ee..3379008b2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,8 @@
       unconditionally quoted, so that schema names which need quoting are fine.
       its slightly unnecessary for schema names which don't need quoting
       but not harmful.
+- sqlite
+   - passthrough for stringified dates
       
 0.3.10
 - general
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 816b1b76a9..965799a224 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -31,7 +31,10 @@ class SLSmallInteger(sqltypes.Smallinteger):
 
 class DateTimeMixin(object):
     def convert_bind_param(self, value, dialect):
-        if value is not None:
+        if isinstance(value, basestring): 
+            # pass string values thru 
+            return value 
+        elif value is not None:
             if getattr(value, 'microsecond', None) is not None:
                 return value.strftime(self.__format__ + "." + str(value.microsecond))
             else:
diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py
index 00f382e209..46069013e6 100644
--- a/test/sql/testtypes.py
+++ b/test/sql/testtypes.py
@@ -336,6 +336,23 @@ class DateTest(AssertMixin):
         l = map(list, users_with_date.select().execute().fetchall())
         self.assert_(l == insert_data, 'DateTest mismatch: got:%s expected:%s' % (l, insert_data))
 
+    @testbase.supported('sqlite') 
+    def test_sqlite_date(self): 
+        meta = MetaData(testbase.db) 
+        t = Table('testdate', meta, 
+                  Column('id', Integer, primary_key=True), 
+                  Column('adate', Date),  
+                  Column('adatetime', DateTime)) 
+        t.create(checkfirst=True) 
+        try: 
+            d1 = datetime.date(2007, 10, 30) 
+            d2 = datetime.datetime(2007, 10, 30) 
+
+            t.insert().execute(adate=str(d1), adatetime=str(d2)) 
+	             
+            assert t.select().execute().fetchall()[0] == (1, datetime.date(2007, 10, 30), datetime.datetime(2007, 10, 30)) 
+        finally: 
+            t.drop(checkfirst=True) 
 
     def testtextdate(self):     
         x = db.text("select user_datetime from query_users_with_date", typemap={'user_datetime':DateTime}).execute().fetchall()