Update Exasol error regex

sqitchers · Dec 30, 2024 · c4457f0 · c4457f0
1 parent 781cafb
commit c4457f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/ubuntu/exasol.sh b/.github/ubuntu/exasol.sh
@@ -13,16 +13,6 @@ fi
 mkdir -p /opt/exasol
 
 # Download and unpack Exasol ODBC Driver & EXAplus.
-# https://downloads.exasol.com/clients-and-drivers
-# 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
-
-# The v8 CLIs aren't working because of a TLS error. If you get it working, be
-# sure to change `odbcinst.ini`'s Exasol config to:
-# Driver      = /opt/exasol/lib/libexaodbc.so
-#
 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

diff --git a/.github/workflows/exasol.yml b/.github/workflows/exasol.yml
@@ -11,7 +11,7 @@ jobs:
   Exasol:
     strategy:
       matrix:
-        exasol: ['8'] #, '7.1', '7.0']
+        exasol: ['8', '7.1', '7.0']
     name: ☀️ Exasol ${{ matrix.exasol }}
     runs-on: ubuntu-latest
     services:

diff --git a/t/exasol.t b/t/exasol.t
@@ -432,9 +432,7 @@ for my $i (1..30) {
         $_;
     };
 
-    # Sleep if it failed but Vertica is still starting up.
-    # SQL-57V03: `failed: FATAL 4149:  Node startup/recovery in progress. Not yet ready to accept connections`
-    # SQL-08001: `failed: [Vertica][DSI] An error occurred while attempting to retrieve the error message for key 'VConnectFailed' and component ID 101: Could not open error message files`
+    # Sleep if it failed but Exasol is still starting up.
     last unless $err && ($DBI::state || '') eq 'HY000';
     sleep 1 if $i < 30;
 }
@@ -451,7 +449,7 @@ DBIEngineTest->run(
         $self->sqitch->probe( $self->client, '-version' );
         $self->_capture('SELECT 1 FROM dual;');
     },
-    engine_err_regex  => qr/\[EXASOL\]\[EXASolution driver\]syntax error/,
+    engine_err_regex  => qr/\[Exasol\]\[Exasol(?:ution)? Driver\]syntax error/i,
     init_error        => __x(
         'Sqitch already initialized',
         schema => $reg2,