Fall back to strptime if fromisoformat is not available

Also add tests for datetimes on MySQL

Author: kislyuk

sqlalchemy_aurora_data_api/__init__.py

@@ -55,7 +55,16 @@ def process(value):
             # and datetime.datetime.fromisoformat can't parse the result (example: '2019-10-31 09:37:17.31869'). Pad it.
             if isinstance(value, str) and self.iso_ts_re.match(value):
                 value = self.iso_ts_re.sub(lambda match: match.group(0).ljust(26, "0"), value)
-            return self.py_type.fromisoformat(value) if isinstance(value, str) else value
+            if isinstance(value, str):
+                try:
+                    return self.py_type.fromisoformat(value)
+                except AttributeError:  # fromisoformat not supported on Python < 3.7
+                    if self.py_type == datetime.date:
+                        return datetime.datetime.strptime(value, "%Y-%m-%d").date()
+                    if self.py_type == datetime.time:
+                        return datetime.datetime.strptime(value, "%H:%M:%S").time()
+                    return datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+            return value
         return process
 
 

test/test.py

@@ -1,7 +1,8 @@
 import os, sys, json, unittest, logging, datetime, getpass, enum
 from uuid import uuid4
 
-from sqlalchemy import create_engine, Column, Integer, String, Boolean, Float, LargeBinary, Numeric, Date, Text, Enum
+from sqlalchemy import (create_engine, Column, Integer, String, Boolean, Float, LargeBinary, Numeric, Date, Time,
+                        DateTime, Text, Enum)
 from sqlalchemy.dialects.postgresql import UUID, JSONB, DATE, TIME, TIMESTAMP, ARRAY
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
@@ -102,12 +103,15 @@ class Socks(enum.Enum):
 
 
 class BasicUser(BasicBase):
-    __tablename__ = "sqlalchemy_aurora_data_api_test"
+    __tablename__ = "sqlalchemy_aurora_data_api_testC"
 
     id = Column(Integer, primary_key=True)
     name = Column(String(64))
     fullname = Column(String(64))
     nickname = Column(String(64))
+    birthday = Column(Date)
+    eats_breakfast_at = Column(Time)
+    married_at = Column(DateTime)
 
 
 class User(Base):
@@ -228,7 +232,11 @@ def test_execute(self):
 
     def test_orm(self):
         BasicBase.metadata.create_all(self.engine)
-        ed_user = BasicUser(name='ed', fullname='Ed Jones', nickname='edsnickname')
+        birthday = datetime.datetime.fromtimestamp(0).date()
+        eats_breakfast_at = datetime.time(9, 0, 0, 123)
+        married_at = datetime.datetime(2020, 2, 20, 2, 20, 2, 200200)
+        ed_user = BasicUser(name='ed', fullname='Ed Jones', nickname='edsnickname',
+                            birthday=birthday, eats_breakfast_at=eats_breakfast_at, married_at=married_at)
         Session = sessionmaker(bind=self.engine)
         session = Session()
 
@@ -241,6 +249,9 @@ def test_orm(self):
         self.assertGreater(session.query(BasicUser).filter(BasicUser.name.like('%ed')).count(), 0)
         u = session.query(BasicUser).filter(BasicUser.name.like('%ed')).first()
         self.assertEqual(u.nickname, "edsnickname")
+        self.assertEqual(u.birthday, birthday)
+        self.assertEqual(u.eats_breakfast_at, eats_breakfast_at.replace(microsecond=0))
+        self.assertEqual(u.married_at, married_at.replace(microsecond=0))
 
 
 if __name__ == "__main__":