Fix timestamp bug on jaydebeapi (#92)

* Fix timestamp bug on jaydebeapi

* ignore coverage

Author: koxudaxi

local_data_api/resources/jdbc/__init__.py

@@ -36,6 +36,25 @@
 TIMESTAMP = [JDBCType.TIMESTAMP, JDBCType.TIMESTAMP_WITH_TIMEZONE]
 
 
+def _fixed_to_datetime(rs: Any, col: Any) -> Optional[str]:  # pragma: no cover
+    """
+    jaydebeapi has a bug that can't be parsed datetime correctly.
+    This workaround will be removed when the PR is merged.
+    https://github.com/baztian/jaydebeapi/pull/177
+    """
+    java_val = rs.getTimestamp(col)
+    if not java_val:
+        return None
+    import datetime
+
+    d = datetime.datetime.strptime(str(java_val)[:19], "%Y-%m-%d %H:%M:%S")
+    d = d.replace(microsecond=int(str(java_val.getNanos()).zfill(9)[:6]))
+    return str(d)
+
+
+jaydebeapi._DEFAULT_CONVERTERS['TIMESTAMP'] = _fixed_to_datetime
+
+
 def attach_thread_to_jvm() -> None:
     "https://github.com/baztian/jaydebeapi/issues/14#issuecomment-261489331"
 

local_data_api/resources/jdbc/mysql.py

@@ -1,11 +1,10 @@
 from typing import Any, Optional
 
-import jaydebeapi
 from sqlalchemy.dialects import mysql
 from sqlalchemy.engine import Dialect
 
 from local_data_api.models import Field
-from local_data_api.resources.jdbc import JDBC
+from local_data_api.resources.jdbc import JDBC, jaydebeapi
 from local_data_api.resources.resource import register_resource_type
 
 

local_data_api/resources/jdbc/postgres.py

@@ -1,12 +1,10 @@
 from typing import Any, Optional, Tuple
 
-import jaydebeapi
-from jpype import java
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.engine import Dialect
 
 from local_data_api.models import Field
-from local_data_api.resources.jdbc import JDBC
+from local_data_api.resources.jdbc import JDBC, jaydebeapi
 from local_data_api.resources.resource import register_resource_type
 
 PG_TYPES: Tuple[str, ...] = (

scripts/integration-test.sh

@@ -100,8 +100,8 @@ function test {
     --resource-arn $RDS_DATA_API_CLIENT_RESOURCE_ARN \
     --secret-arn $RDS_DATA_API_CLIENT_SECRETARN \
     --include-result-metadata \
-    --sql $'SELECT CAST(\'2021-03-10 22:41:04.968123+02\' AS TIMESTAMPTZ) AS value' \
-      | jq -e '.records[0][0].stringValue == "2021-03-10 20:41:04.968"'
+    --sql $'SELECT CAST(\'2021-03-10 22:41:04.068123+02\' AS TIMESTAMPTZ) AS value' \
+      | jq -e '.records[0][0].stringValue == "2021-03-10 20:41:04.068"'
     fi
 
     if [ "$db" = "mysql" ]