diff --git a/lib/dl_connector_mysql/dl_connector_mysql/formula/definitions/functions_type.py b/lib/dl_connector_mysql/dl_connector_mysql/formula/definitions/functions_type.py index df9332cfd..1c410ed3d 100644 --- a/lib/dl_connector_mysql/dl_connector_mysql/formula/definitions/functions_type.py +++ b/lib/dl_connector_mysql/dl_connector_mysql/formula/definitions/functions_type.py @@ -60,17 +60,17 @@ ), base.FuncFloatFromDate( variants=[ - V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.FLOAT)), + V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.DOUBLE)), ] ), base.FuncFloatFromDatetime( variants=[ - V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.FLOAT)), + V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.DOUBLE)), ] ), base.FuncFloatFromGenericDatetime( variants=[ - V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.FLOAT)), + V(D.MYSQL, lambda value: sa.cast(sa.func.UNIX_TIMESTAMP(value), sa_mysql.DOUBLE)), ] ), # genericdatetime diff --git a/lib/dl_connector_mysql/docker-compose.yml b/lib/dl_connector_mysql/docker-compose.yml index aecf1174a..1e7940b45 100644 --- a/lib/dl_connector_mysql/docker-compose.yml +++ b/lib/dl_connector_mysql/docker-compose.yml @@ -13,10 +13,10 @@ services: ports: - "52000:3306" db-mysql-8-0: - # image: "mysql:8.0.12" + # image: "mysql:8.0.40" build: context: docker-compose - dockerfile: Dockerfile.db-mysql-8.0.12 + dockerfile: Dockerfile.db-mysql-8.0.40 environment: MYSQL_ALLOW_EMPTY_PASSWORD: "1" MYSQL_DATABASE: "test_data" diff --git a/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.12 b/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.12 deleted file mode 100644 index 595b4712b..000000000 --- a/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.12 +++ /dev/null @@ -1,5 +0,0 @@ -# the earliest version supported by DL -# FROM mysql:8.0.12 -FROM mysql:8.0.12@sha256:8fdc47e9ccb8112a62148032ae70484e3453b628ab6fe02bccf159e2966b750e - -COPY db-mysql/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d diff --git a/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.40 b/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.40 new file mode 100644 index 000000000..e371a5a9a --- /dev/null +++ b/lib/dl_connector_mysql/docker-compose/Dockerfile.db-mysql-8.0.40 @@ -0,0 +1,4 @@ +# FROM mysql:8.0.40 +FROM mysql:8.0.40@sha256:d58ac93387f644e4e040c636b8f50494e78e5afc27ca0a87348b2f577da2b7ff + +COPY db-mysql/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d