From 49cfdc694d4923341546b317358690469b0813c4 Mon Sep 17 00:00:00 2001 From: Karol Wolski Date: Tue, 17 Sep 2024 12:07:21 +0200 Subject: [PATCH] odbcinst multiplatform support --- docker/Dockerfile | 1 + docker/odbcinst.ini | 10 +++++----- pyproject.toml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c5ba6c350..4c000450a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -61,6 +61,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc COPY docker/odbcinst.ini /etc +RUN sed "s/PLATFORM/$(uname -m)/" /etc/odbcinst.ini WORKDIR ${HOME} diff --git a/docker/odbcinst.ini b/docker/odbcinst.ini index 3367ebf85..01cc885c9 100644 --- a/docker/odbcinst.ini +++ b/docker/odbcinst.ini @@ -1,10 +1,10 @@ -[ODBC Driver 17 for SQL Server] -Description=Microsoft ODBC Driver 17 for SQL Server -Driver=/opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.1.1 +[ODBC Driver 18 for SQL Server] +Description=Microsoft ODBC Driver 18 for SQL Server +Driver=/opt/microsoft/msodbcsql18/lib64/libmsodbcsql-18.4.so.1.1 UsageCount=1 [SQLite] Description=SQLite3 ODBC Driver -Driver=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so -Setup=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so +Driver=/usr/lib/PLATFORM-linux-gnu/odbc/libsqlite3odbc.so +Setup=/usr/lib/PLATFORM-linux-gnu/odbc/libsqlite3odbc.so UsageCount=1 diff --git a/pyproject.toml b/pyproject.toml index 7728fa3c8..72950d711 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "viadot2" -version = "2.1.18" +version = "2.1.19" description = "A simple data ingestion library to guide data flows from some places to other places." authors = [ { name = "acivitillo", email = "acivitillo@dyvenia.com" },