Merge develop for v1.5.0

Author: theory

.github/ubuntu/all-apt-prereqs.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 sudo apt-get update -qq
@@ -8,5 +10,9 @@ sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq \
     default-jre \
     firebird-dev firebird3.0-utils \
     mysql-client default-libmysqlclient-dev \
-    libarchive-tools
+    libarchive-tools \
+    libaio1t64
 cat t/odbc/odbcinst.ini | sudo tee -a /etc/odbcinst.ini
+
+# instantclient still wants libaio.so.1. https://askubuntu.com/a/1514001
+sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1

.github/ubuntu/exasol.sh

@@ -13,13 +13,12 @@ fi
 mkdir -p /opt/exasol
 
 # Download and unpack Exasol ODBC Driver & EXAplus.
-# https://www.exasol.com/portal/display/DOWNLOAD/
-curl -sSLO https://x-up.s3.amazonaws.com/7.x/7.1.17/EXASOL_ODBC-7.1.17.tar.gz
-curl -sSLO https://x-up.s3.amazonaws.com/7.x/7.1.17/EXAplus-7.1.17.tar.gz
-sudo tar -xzf EXASOL_ODBC-7.1.17.tar.gz -C /opt/exasol --strip-components 1
-sudo tar -xzf EXAplus-7.1.17.tar.gz     -C /opt/exasol --strip-components 1
+curl -sSLO https://x-up.s3.amazonaws.com/7.x/24.2.0/Exasol_ODBC-24.2.0-Linux_x86_64.tar.gz
+curl -sSLO https://x-up.s3.amazonaws.com/7.x/24.2.1/EXAplus-24.2.1.tar.gz
+sudo tar -xzf Exasol_ODBC-24.2.0-Linux_x86_64.tar.gz -C /opt/exasol --strip-components 2
+sudo tar -xzf EXAplus-24.2.1.tar.gz                  -C /opt/exasol --strip-components 2
 
 # Add to the path.
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/opt/exasol" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/opt/exasol" >> "$GITHUB_PATH"
 fi

.github/ubuntu/firebird.sh

@@ -9,6 +9,6 @@ if [ -z "$SKIP_DEPENDS" ]; then
 fi
 
 # Tell DBD::Firebird where to find the libraries.
-if [[ ! -z "$GITHUB_ENV" ]]; then
-    echo "FIREBIRD_HOME=/usr" >> $GITHUB_ENV
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo "FIREBIRD_HOME=/usr" >> "$GITHUB_ENV"
 fi

.github/ubuntu/mysql.sh

@@ -6,5 +6,5 @@ set -e
 if [ -z "$SKIP_DEPENDS" ]; then
     sudo apt-get update -qq
     sudo apt-get remove -qq mysql-common # https://github.com/actions/virtual-environments/issues/5067#issuecomment-1038752575
-    sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq mysql-client default-libmysqlclient-dev
+    sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq mariadb-client libmariadbd-dev
 fi

.github/ubuntu/oracle.sh

@@ -2,13 +2,17 @@
 
 set -e
 
-version=21.9.0.0.0dbru
-icdr=219000
+version=23.6.0.24.10
+icdr=2360000
 
-# Install bsdtar, required to get --strip-components for a zip file.
+# Download dependencies.
 if [ -z "$SKIP_DEPENDS" ]; then
+    # Install libaio and bsdtar, required to get --strip-components for a zip file.
     sudo apt-get update -qq
-    sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq libarchive-tools
+    sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq libarchive-tools libaio1t64
+
+    # instantclient still wants libaio.so.1. https://askubuntu.com/a/1514001
+    sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
 fi
 
 # Download Instant Client.
@@ -24,15 +28,15 @@ bsdtar -C /opt/instantclient --strip-components 1 -zxf "instantclient-basic-linu
 bsdtar -C /opt/instantclient --strip-components 1 -zxf "instantclient-sqlplus-linux.x64-${version}.zip"
 bsdtar -C /opt/instantclient --strip-components 1 -zxf "instantclient-sdk-linux.x64-${version}.zip"
 
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/opt/instantclient" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/opt/instantclient" >> "$GITHUB_PATH"
 fi
 
-if [[ ! -z "$GITHUB_ENV" ]]; then
-    echo "ORACLE_HOME=/opt/instantclient" >> $GITHUB_ENV
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo "ORACLE_HOME=/opt/instantclient" >> "$GITHUB_ENV"
     if [[ -z "$LD_LIBRARY_PATH" ]]; then
-        echo "LD_LIBRARY_PATH=/opt/instantclient" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/opt/instantclient" >> "$GITHUB_ENV"
     else
-        echo "LD_LIBRARY_PATH=/opt/instantclient:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/opt/instantclient:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
     fi
 fi

.github/ubuntu/pg.sh

@@ -9,6 +9,6 @@ curl -O https://salsa.debian.org/postgresql/postgresql-common/-/raw/master/pgdg/
 sudo sh apt.postgresql.org.sh -i -t -v $PGVERSION
 sudo pg_createcluster --start $PGVERSION test -p 5432 --locale=C -- -A trust -E UTF8
 
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/usr/lib/postgresql/$POSTGRES/bin" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/usr/lib/postgresql/$POSTGRES/bin" >> "$GITHUB_PATH"
 fi

.github/ubuntu/snowflake.sh

@@ -11,8 +11,8 @@ fi
 
 # https://docs.snowflake.net/manuals/release-notes/client-change-log-snowsql.html
 # https://sfc-repo.snowflakecomputing.com/index.html
-curl -sSLo snowsql.bash https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.20-linux_x86_64.bash
-curl -sSLo snowdbc.tgz https://sfc-repo.snowflakecomputing.com/odbc/linux/2.24.2/snowflake_linux_x8664_odbc-2.24.2.tgz
+curl -sSLo snowsql.bash https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.21-linux_x86_64.bash
+curl -sSLo snowdbc.tgz https://sfc-repo.snowflakecomputing.com/odbc/linux/latest/snowflake_linux_x8664_odbc-3.5.0.tgz
 
 # Install and configure ODBC.
 mkdir -p /opt/snowflake
@@ -22,14 +22,14 @@ sudo mv /opt/snowflake/ErrorMessages/en-US /opt/snowflake/lib/
 # Install, update, and configure SnowSQL.
 sed -e '1,/^exit$/d' snowsql.bash | sudo tar -C /opt/snowflake -zxf -
 /opt/snowflake/snowsql -Uv
-echo "[options]\nnoup = true" > /opt/snowflake/config
+printf "[options]\nnoup = true\n" > /opt/snowflake/config
 
 # Add to the path.
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/opt/snowflake" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/opt/snowflake" >> "$GITHUB_PATH"
 fi
 
 # Tell SnowSQL where to find the config.
-if [[ ! -z "$GITHUB_ENV" ]]; then
-    echo "WORKSPACE=/opt/snowflake" >> $GITHUB_ENV
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo "WORKSPACE=/opt/snowflake" >> "$GITHUB_ENV"
 fi

.github/ubuntu/sqlite.sh

@@ -6,13 +6,14 @@ SQLITE=${SQLITE:=${1:-3.40.1}}
 echo "Instaling SQLite $SQLITE"
 
 # Convert to the SQLITE_VERSION_NUMBER format https://sqlite.org/c3ref/c_source_id.html
-SQLITE=$(perl -e 'my @v = split /[.]/, shift; printf "%d%02d%02d%02d\n", @v[0..3]' $SQLITE)
+SQLITE=$(perl -e 'my @v = split /[.]/, shift; printf "%d%02d%02d%02d\n", @v[0..3]' "$SQLITE")
 
 # Since 3.7.16.1, the URL includes the year in the path.
 # 3.18.2, 3.18.1, 3.9.3, and 3.7.11 missing.
 # https://sqlite.org/chronology.html
 # https://stackoverflow.com/a/37712117/79202
-if   (( $SQLITE >= 3400200 )); then YEAR=2023
+if   (( $SQLITE >= 3450000 )); then YEAR=2024
+elif (( $SQLITE >= 3400200 )); then YEAR=2023
 elif (( $SQLITE >= 3370200 )); then YEAR=2022
 elif (( $SQLITE >= 3340100 )); then YEAR=2021
 elif (( $SQLITE >= 3310000 )); then YEAR=2020
@@ -41,20 +42,20 @@ gcc -shared -o libsqlite3.so -fPIC sqlite3.o -ldl -lpthread
 # Hand-build DBD::SQLite against the version of SQLite just installed.
 DIST=$(cpanm --info DBD::SQLite) # ISHIGAKI/DBD-SQLite-1.70.tar.gz
 URL=https://cpan.metacpan.org/authors/id/${DIST:0:1}/${DIST:0:2}/$DIST
-curl -o dbd.tar.gz $URL
+curl -o dbd.tar.gz "$URL"
 tar zxvf dbd.tar.gz --strip-components 1
 perl -i -pe 's/^if\s*\(\s*0\s*\)\s\{/if (1) {/' Makefile.PL
 perl Makefile.PL SQLITE_INC=/opt/sqlite SQLITE_LIB=/opt/sqlite
 make && make install
 
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/opt/sqlite" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/opt/sqlite" >> "$GITHUB_PATH"
 fi
 
-if [[ ! -z "$GITHUB_ENV" ]]; then
+if [[ -n "$GITHUB_ENV" ]]; then
     if [[ -z "$LD_LIBRARY_PATH" ]]; then
-        echo "LD_LIBRARY_PATH=/opt/sqlite" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/opt/sqlite" >> "$GITHUB_ENV"
     else
-        echo "LD_LIBRARY_PATH=/opt/sqlite:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/opt/sqlite:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
     fi
 fi

.github/ubuntu/vertica.sh

@@ -11,9 +11,9 @@ fi
 cat t/odbc/vertica.ini | sudo tee -a /etc/vertica.ini
 
 # https://www.vertica.com/download/vertica/client-drivers/
-curl -sSLO https://www.vertica.com/client_drivers/12.0.x/12.0.3-0/vertica-client-12.0.3-0.x86_64.tar.gz
-sudo tar -xzf vertica-client-12.0.3-0.x86_64.tar.gz -C /
+curl -sSLO https://www.vertica.com/client_drivers/24.2.x/24.2.0-1/vertica-client-24.2.0-1.x86_64.tar.gz
+sudo tar -xzf vertica-client-24.2.0-1.x86_64.tar.gz -C /
 
-if [[ ! -z "$GITHUB_PATH" ]]; then
-    echo "/opt/vertica/bin" >> $GITHUB_PATH
+if [[ -n "$GITHUB_PATH" ]]; then
+    echo "/opt/vertica/bin" >> "$GITHUB_PATH"
 fi

.github/workflows/coverage.yml

@@ -18,10 +18,10 @@ jobs:
         ports: [ 8563 ]
         options: --privileged
       firebird:
-        image: jacobalberty/firebird:latest
+        image: ghcr.io/fdcastel/firebird:latest
         ports: [ 3050 ]
         env:
-          ISC_PASSWORD: nix
+          FIREBIRD_ROOT_PASSWORD: nix
           FIREBIRD_DATABASE: sqitchtest.db
       mysql:
         image: mysql:latest
@@ -44,9 +44,9 @@ jobs:
         image: vertica/vertica-ce:latest
         ports: [ 5433 ]
     steps:
-      # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
+      # https://github.com/orgs/community/discussions/25678#discussioncomment-9017167
       - name: Free Disk Space
-        run: rm -rf /opt/hostedtoolcache
+        run: find /opt -maxdepth 1 -mindepth 1 '!' -path ./containerd '!' -path ./actionarchivecache '!' -path ./runner '!' -path ./runner-cache -exec rm -rf '{}' ';'
       - name: Start CockroachDB
         run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest start-single-node --insecure
       - uses: actions/checkout@v4
@@ -75,15 +75,15 @@ jobs:
           .github/ubuntu/snowflake.sh
           .github/ubuntu/vertica.sh
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBI DBD::ODBC DBD::Firebird DBD::Oracle DBD::mysql DBD::Pg Devel::Cover Devel::Cover::Report::Coveralls
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBI DBD::ODBC DBD::Firebird DBD::Oracle DBD::MariaDB DBD::Pg Devel::Cover Devel::Cover::Report::Coveralls
       - name: Run Tests
         env:
           PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
           HARNESS_PERL_SWITCHES: -MDevel::Cover=-ignore,^(?:x?t|inc|bin|local)/
           LIVE_EXASOL_REQUIRED: true
-          SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[8563] }}/?Driver=Exasol;SSLCertificate=SSL_VERIFY_NONE
+          SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[8563] }}/?Driver=Exasol;SSLCERTIFICATE=SSL_VERIFY_NONE
           LIVE_FIREBIRD_REQUIRED: true
-          SQITCH_TEST_FIREBIRD_URI: db:firebird://sysdba:[email protected]:${{ job.services.firebird.ports[3050] }}//firebird/data/sqitchtest.db
+          SQITCH_TEST_FIREBIRD_URI: db:firebird://sysdba:[email protected]:${{ job.services.firebird.ports[3050] }}//var/lib/firebird/data/sqitchtest.db
           LIVE_MYSQL_REQUIRED: true
           SQITCH_TEST_MYSQL_URI: "db:mysql://[email protected]:${{ job.services.mysql.ports[3306] }}/information_schema"
           LIVE_ORACLE_REQUIRED: true