Skip to content

AJDA-214: Update ODBC driver #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Jun 6, 2025
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fd107f4
tmp: odbc verbose logging
MiroCillik May 20, 2025
a1cae0f
fix: dockerfile awscli
MiroCillik May 20, 2025
2179cdc
fix: dockerfile awscli 2
MiroCillik May 20, 2025
46f50e1
tmp: disable datadir tests for now
MiroCillik May 20, 2025
77865c3
fix: dockerfile awscli 3
MiroCillik May 20, 2025
b1e6caa
more logs
MiroCillik May 20, 2025
6c781e1
more logs 2
MiroCillik May 21, 2025
486057e
more logs 3
MiroCillik May 21, 2025
0313cc0
feat: latest ODBC driver
MiroCillik May 21, 2025
8c25e57
fix (Dockerfile): add libiodbc2-dev
MiroCillik May 21, 2025
9285755
fix (Dockerfile): add libiodbc2 fix
MiroCillik May 21, 2025
cf84c99
deps: update db-extractor-adapter
MiroCillik May 22, 2025
502b3f8
fix (run.php): logging in catch
MiroCillik May 29, 2025
45843dd
deps: updated db-ex-adapter with fetch_result
MiroCillik May 29, 2025
26212b6
try (Dockerfile): DefaultStringColumnLength = 65535'
MiroCillik May 29, 2025
1dd64d9
try (Dockerfile): DefaultStringColumnLength = 32767
MiroCillik May 29, 2025
d52c142
deps: updated db-ex-adapter with fetch_result 2
MiroCillik May 29, 2025
c6c3adb
new odbc driver 6
MiroCillik May 29, 2025
f5b71c3
tests (HiveDsnFactoryTest): dsn changed
MiroCillik May 29, 2025
005017c
tests (HiveDsnFactoryTest): dsn changed 2
MiroCillik May 29, 2025
2fd73b8
tests (HiveDsnFactoryTest): dsn changed 3
MiroCillik May 29, 2025
e205f24
dev-odbc-new-driver-10
MiroCillik May 30, 2025
00613fe
dev-odbc-new-driver-11
MiroCillik May 30, 2025
31faee4
tests (HiveDsnFactoryTest): dsn changed 4
MiroCillik May 30, 2025
13e08ec
try: sanitize utf-8
MiroCillik May 30, 2025
7e38a14
tests: dsn factory test again
MiroCillik May 30, 2025
bda7dd6
cs
MiroCillik May 30, 2025
9a5bdf2
deps: adapter update - longread 32MB
MiroCillik May 30, 2025
302d417
fix mb convert encoding cs
MiroCillik May 30, 2025
f3ee2da
revert run.php
MiroCillik Jun 2, 2025
d017b53
refactor: HiveOdbcQueryResult now extends OdbcQueryResult and overrid…
MiroCillik Jun 2, 2025
5f66bd6
deps: db-extractor-adapter --> 1.15.2
MiroCillik Jun 3, 2025
522e40e
tests: restore datadir tests
MiroCillik Jun 3, 2025
cd03679
tests (functional): update lenghts in dsn string and logging message
MiroCillik Jun 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: latest ODBC driver
  • Loading branch information
MiroCillik committed May 21, 2025
commit 0313cc0fd6d384966e7a243cf5c7f1ed0e1eff94
28 changes: 15 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
AWS_REGION=${AWS_REGION}

RUN aws s3 cp \
s3://keboola-drivers/hive-odbc/ClouderaHiveODBC-2.6.13.1013-1.x86_64.rpm \
/tmp/hive-odbc.rpm
s3://keboola-drivers/hive-odbc/clouderahiveodbc_2.8.2.1002-2_amd64.deb \
/tmp/hive-odbc.deb

FROM php:8.2-cli-buster

Expand All @@ -27,7 +27,6 @@ COPY docker/php/composer-install.sh /tmp/composer-install.sh
# https://github.com/debuerreotype/docker-debian-artifacts/issues/24
RUN mkdir -p /usr/share/man/man1 && \
apt-get update && apt-get install -y --no-install-recommends \
alien \
ssh \
git \
locales \
Expand All @@ -46,11 +45,11 @@ RUN mkdir -p /usr/share/man/man1 && \
libzip-dev \
# keytool is in JRE
default-jre \
&& rm -r /var/lib/apt/lists/* \
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
&& locale-gen \
&& chmod +x /tmp/composer-install.sh \
&& /tmp/composer-install.sh
&& rm -r /var/lib/apt/lists/* \
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
&& locale-gen \
&& chmod +x /tmp/composer-install.sh \
&& /tmp/composer-install.sh

# INTL
RUN docker-php-ext-configure intl \
Expand All @@ -74,11 +73,14 @@ RUN set -ex; \
docker-php-ext-install odbc; \
docker-php-source delete

# Clouder Hive Driver
COPY --from=awscli /tmp/hive-odbc.rpm /tmp/hive-odbc.rpm
RUN alien -i /tmp/hive-odbc.rpm \
&& rm /tmp/hive-odbc.rpm \
&& cp /opt/cloudera/hiveodbc/Setup/odbc.ini /etc/odbc.ini \
# Cloudera Hive Driver
COPY --from=awscli /tmp/hive-odbc.deb /tmp/hive-odbc.deb
RUN dpkg -i /tmp/hive-odbc.deb || true \
&& apt-get update \
&& apt-get install -f -y \
&& rm -rf /var/lib/apt/lists/* \
&& rm /tmp/hive-odbc.deb \
&& cp /opt/cloudera/hiveodbc/Setup/odbc.ini /etc/odbc.ini \
&& cp /opt/cloudera/hiveodbc/Setup/odbcinst.ini /etc/odbcinst.ini

# Create odbc logs dir
Expand Down
Loading