Test Firebird 2.5

sqitchers · Dec 30, 2024 · 42550f2 · 42550f2
1 parent 2d5c9af
commit 42550f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/firebird.yml b/.github/workflows/firebird.yml
@@ -12,19 +12,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - { version: '5' }
-          - { version: '4' }
-          - { version: '3' }
+          - { version: '5',      image: ghcr.io/fdcastel/firebird, dir: /var/lib/firebird/data }
+          - { version: '4',      image: ghcr.io/fdcastel/firebird, dir: /var/lib/firebird/data }
+          - { version: '3',      image: ghcr.io/fdcastel/firebird, dir: /var/lib/firebird/data }
+          - { version: '2.5-ss', image: jacobalberty/firebird,     dir: /firebird/data         } # deprecated
+          - { version: '2.5-sc', image: jacobalberty/firebird,     dir: /firebird/data         } # deprecated
     name: 🔥 Firebird ${{ matrix.version }}
     runs-on: ubuntu-latest
     services:
       # Run the Firebird service in a container we can connect to. Means that the
       # CLI and libraries DBD::firebird use are static to the version on the runner
       # machine.
       firebird:
-        image: ghcr.io/fdcastel/firebird:${{ matrix.version }}
+        image: ${{ matrix.image }}:${{ matrix.version }}
         ports: [ 3050 ]
         env:
+          ISC_PASSWORD: nix # for jacobalberty/firebird only
           FIREBIRD_ROOT_PASSWORD: nix
           FIREBIRD_DATABASE: sqitchtest.db
     steps:
@@ -46,5 +49,5 @@ jobs:
         env:
           PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
           LIVE_FIREBIRD_REQUIRED: true
-          SQITCH_TEST_FIREBIRD_URI: db:firebird://sysdba:[email protected]:${{ job.services.firebird.ports[3050] }}//var/lib/firebird/data/sqitchtest.db
+          SQITCH_TEST_FIREBIRD_URI: db:firebird://sysdba:[email protected]:${{ job.services.firebird.ports[3050] }}/${{ matrix.dir }}/sqitchtest.db
         run: prove -lvr t/firebird.t
diff --git a/README.md b/README.md
@@ -171,7 +171,7 @@ SOFTWARE.
   [Perl]:      https://github.com/sqitchers/sqitch/actions/workflows/perl.yml/badge.svg
   [🧅]:        https://github.com/sqitchers/sqitch/actions/workflows/perl.yml "Tested with Perl 5.12–5.40"
   [Firebird]:  https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml/badge.svg
-  [🔥]:        https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml "Tested with Firebird 3.0–5.0"
+  [🔥]:        https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml "Tested with Firebird 2.5–5.0"
   [Snowflake]: https://github.com/sqitchers/sqitch/actions/workflows/snowflake.yml/badge.svg
   [❄️]:         https://github.com/sqitchers/sqitch/actions/workflows/snowflake.yml "Tested with Snowflake"
   [Homebrew]:  https://img.shields.io/github/v/tag/sqitchers/homebrew-sqitch?label=%F0%9F%8D%BA%20Homebrew&sort=semver

diff --git a/t/lib/DBIEngineTest.pm b/t/lib/DBIEngineTest.pm
@@ -1774,9 +1774,10 @@ sub run {
 
             # Make a second connection to the database.
             my $dbh = DBI->connect($engine->uri->dbi_dsn, $engine->username, $engine->password, {
-                PrintError        => 0,
-                RaiseError        => 1,
-                AutoCommit        => 1,
+                PrintError  => 0,
+                RaiseError  => 0,
+                AutoCommit  => 1,
+                HandleError => $engine->_error_handler,
             });
             ok !$dbh->selectcol_arrayref($sql->{try_lock})->[0],
                 'Should fail to get same lock in second connection';