ci: replace Docker with PSFirebird for unified Windows/Linux testing

Use PSFirebird (v1.2.2+) instead of Docker to run Firebird on both Ubuntu
and Windows runners. This removes the platform split where Linux used Docker
and Windows was untested.

Changes:
- Install PSFirebird module in each CI job
- Use New-FirebirdEnvironment / Start-FirebirdInstance / Stop-FirebirdInstance
  to manage Firebird lifecycle on both platforms
- Initialize SYSDBA via embedded isql (archive-extracted Firebird ships with
  an empty security database; embedded connections bypass authentication)
- Set ISC_USER / ISC_PASSWORD env vars at job level for driver test auth
- Seed firebird.log before server start so Service API get_log() tests pass
  (archive-extracted Firebird never writes startup messages to this file)
- Use GetClientLibraryPath() on the FirebirdEnvironment object to pass the
  correct client library to the test suite on both platforms
- Fix LASTEXITCODE false-failure workaround (PSFirebird 1.2.2 fixes the leak
  in Get-FirebirdEnvironment / New-FirebirdEnvironment)

Minor bugs fixed (no separate Issue/PR needed):
- Convert client_lib Path to str before assigning to driver_config
  (Path objects are not accepted by the StringOption config field)
- Fix inet:// protocol URL construction for Windows drive-letter paths:
  _connect_helper was missing the '/' separator before the database path
  when host is set, producing malformed URLs like inet://host:3050D:\\path
- Remove spurious utf8filename=true from test_connect_config database config
  (caused 'unavailable database' on Windows when attaching to an existing DB)
- Fix test_connect_helper expected DSN values to match the corrected URL format

Author: fdcastel

.github/workflows/ci.yml

@@ -7,111 +7,81 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         firebird-version: [3, 4, 5]
+        os: [ubuntu-22.04, windows-latest]
         include:
           - firebird-version: 3
             db-file: fbtest30.fdb
-            docker-image: firebirdsql/firebird:3
+            fb-semver: '3.0.13'
           - firebird-version: 4
             db-file: fbtest40.fdb
-            docker-image: firebirdsql/firebird:4
+            fb-semver: '4.0.6'
           - firebird-version: 5
             db-file: fbtest50.fdb
-            docker-image: firebirdsql/firebird:5
-    
+            fb-semver: '5.0.3'
+
+    defaults:
+      run:
+        shell: pwsh
+
+    env:
+      GITHUB_TOKEN: ${{ github.token }}
+      ISC_USER: SYSDBA
+      ISC_PASSWORD: masterkey
+
     steps:
     - uses: actions/checkout@v4
-    
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.11'
-    
+
     - name: Install Hatch
       run: pip install hatch
-    
-    - name: Start Firebird Docker container
+
+    - name: Install PSFirebird
       run: |
-        # Create a tmp directory that will be bind-mounted to the container
-        # This ensures test files are accessible at the same paths inside and outside the container
-        mkdir -p /tmp/firebird-test
-        
-        # Start Firebird container with /tmp bind-mounted
-        # Configure RemoteAuxPort for Firebird events support
-        docker run -d \
-          --name firebird \
-          -e FIREBIRD_ROOT_PASSWORD=masterkey \
-          -e ISC_PASSWORD=masterkey \
-          -e FIREBIRD_CONF_RemoteAuxPort=3051 \
-          -p 3050:3050 \
-          -p 3051:3051 \
-          -v /tmp:/tmp:rw \
-          ${{ matrix.docker-image }}
-    
-    - name: Wait for Firebird to be ready
+        Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force -Scope CurrentUser -ForceBootstrap -ErrorAction Continue
+        Install-Module -Name PSFirebird -MinimumVersion 1.2.2 -Force -AllowClobber -Scope CurrentUser -Repository PSGallery
+
+    - name: Create Firebird environment
       run: |
-        echo "Waiting for Firebird to be fully ready..."
-        for i in {1..30}; do
-          if docker exec firebird /bin/bash -c "echo 'SELECT 1 FROM RDB\$DATABASE;' | /opt/firebird/bin/isql -u SYSDBA -p masterkey employee" &>/dev/null 2>&1; then
-            echo "Firebird is ready!"
-            exit 0
-          fi
-          echo "Waiting... ($i/30)"
-          sleep 2
-        done
-        echo "Firebird failed to start"
-        docker logs firebird
-        exit 1
-    
-    - name: Extract and install Firebird client library from container
+        $tempPath = if ($IsWindows) { $env:TEMP } else { '/tmp' }
+        $fbPath = Join-Path $tempPath 'firebird-${{ matrix.firebird-version }}'
+        $fbEnv = New-FirebirdEnvironment -Version '${{ matrix.fb-semver }}' -Path $fbPath
+        Write-Output $fbEnv
+        Write-Output "FB_PATH=$fbPath" >> $env:GITHUB_ENV
+        Write-Output "FB_CLIENT_LIB=$($fbEnv.GetClientLibraryPath())" >> $env:GITHUB_ENV
+
+    - name: Configure and start Firebird
       run: |
-        # List available libraries in container for debugging
-        echo "Available libraries in container:"
-        docker exec firebird ls -la /opt/firebird/lib/ || docker exec firebird ls -la /usr/lib/
-        
-        # Find and extract client library from the running container
-        # Different versions may have different file names or locations
-        LIB_PATH=""
-        if docker exec firebird test -f /opt/firebird/lib/libfbclient.so.2; then
-          # Get the actual file path by resolving the symlink
-          LIB_PATH=$(docker exec firebird readlink -f /opt/firebird/lib/libfbclient.so.2)
-        elif docker exec firebird test -f /opt/firebird/lib/libfbclient.so; then
-          LIB_PATH=$(docker exec firebird readlink -f /opt/firebird/lib/libfbclient.so)
-        elif docker exec firebird test -f /usr/lib/libfbclient.so; then
-          LIB_PATH=$(docker exec firebird readlink -f /usr/lib/libfbclient.so)
-        elif docker exec firebird test -f /usr/lib/x86_64-linux-gnu/libfbclient.so.2; then
-          LIB_PATH=$(docker exec firebird readlink -f /usr/lib/x86_64-linux-gnu/libfbclient.so.2)
-        else
-          echo "Could not find libfbclient.so in container"
-          exit 1
-        fi
-        
-        echo "Copying library from: $LIB_PATH"
-        # Copy the actual library file (not the symlink)
-        docker cp firebird:$LIB_PATH ${{ github.workspace }}/libfbclient.so
-        
-        # Install to system
-        sudo cp ${{ github.workspace }}/libfbclient.so /usr/lib/x86_64-linux-gnu/
-        sudo ldconfig
-        
-        # Verify installation
-        ldconfig -p | grep libfbclient
-    
+        # Configure RemoteAuxPort for Firebird events support
+        $confPath = Join-Path $env:FB_PATH 'firebird.conf'
+        Write-FirebirdConfiguration -Path $confPath -Configuration @{ RemoteAuxPort = 3051 }
+        # Initialize SYSDBA via embedded connection (ISC_USER/ISC_PASSWORD env vars are set at job level)
+        $initDb = New-FirebirdDatabase -Database (Join-Path $env:FB_PATH 'init.fdb') -Environment $env:FB_PATH
+        "CREATE USER SYSDBA PASSWORD 'masterkey';" | Invoke-FirebirdIsql -Database $initDb -Environment $env:FB_PATH
+        Remove-FirebirdDatabase -Database $initDb -Force
+        # Seed firebird.log so get_log() service API calls return non-empty content
+        # (Firebird does not write startup messages in this mode; tests assert log is non-empty)
+        "Firebird`tServer started" | Out-File -FilePath (Join-Path $env:FB_PATH 'firebird.log') -Encoding utf8 -NoNewline:$false
+        # Start Firebird server
+        Start-FirebirdInstance -Environment $env:FB_PATH | Write-Output
+
     - name: Run tests
-      run: hatch test -- --host=localhost --port=3050 -v
+      run: hatch test -- --host=localhost --port=3050 "--client-lib=$env:FB_CLIENT_LIB" -v
       env:
         FIREBIRD_VERSION: ${{ matrix.firebird-version }}
-    
-    - name: Stop Firebird container
+
+    - name: Stop Firebird instance
       if: always()
-      run: |
-        docker logs firebird
-        docker stop firebird
-        docker rm firebird
+      run: Get-FirebirdInstance | Stop-FirebirdInstance
 
   build:
     needs: test

src/firebird/driver/core.py

@@ -2180,7 +2180,7 @@ def _connect_helper(dsn: str, host: str, port: str, database: str, protocol: Net
                     # Unix absolute path - use double slash so Firebird keeps the leading /
                     dsn += f'/{database}'  # Results in inet://host//absolute/path
                 elif ':' in database:  # Windows path (e.g., C:\...)
-                    dsn += database  # Concatenate directly without separator
+                    dsn += f'/{database}'  # Results in inet://host:port/D:\path
                 else:  # Relative/alias
                     dsn += f'/{database}'
             else:

tests/conftest.py

@@ -122,7 +122,7 @@ def pytest_configure(config):
             client_lib = Path(client_lib)
             if not client_lib.is_file():
                 pytest.exit(f"Client library '{client_lib}' not found!")
-            driver_config.fb_client_library.value = client_lib
+            driver_config.fb_client_library.value = str(client_lib)
         #
         if host := config.getoption('host'):
             _vars_['host'] = host

tests/test_connection.py

@@ -84,19 +84,19 @@ def test_connect_helper():
     dsn = driver.core._connect_helper(None, IP, None, DB_LINUX_PATH, NetProtocol.INET)
     assert dsn == f'inet://{IP}/{DB_LINUX_PATH}'  # Double slash for absolute path
     dsn = driver.core._connect_helper(None, HOST, None, DB_WIN_PATH, NetProtocol.INET)
-    assert dsn == f'inet://{HOST}{DB_WIN_PATH}'
+    assert dsn == f'inet://{HOST}/{DB_WIN_PATH}'
     # 3. TCP/IP with Port
     dsn = driver.core._connect_helper(None, HOST, PORT, DB_ALIAS, NetProtocol.INET)
     assert dsn == f'inet://{HOST}:{PORT}/{DB_ALIAS}'
     dsn = driver.core._connect_helper(None, IP, PORT, DB_LINUX_PATH, NetProtocol.INET)
     assert dsn == f'inet://{IP}:{PORT}/{DB_LINUX_PATH}'  # Double slash for absolute path
     dsn = driver.core._connect_helper(None, HOST, SVC_NAME, DB_WIN_PATH, NetProtocol.INET)
-    assert dsn == f'inet://{HOST}:{SVC_NAME}{DB_WIN_PATH}'
+    assert dsn == f'inet://{HOST}:{SVC_NAME}/{DB_WIN_PATH}'
     # 4. Named pipes
     dsn = driver.core._connect_helper(None, NPIPE_HOST, None, DB_ALIAS, NetProtocol.WNET)
     assert dsn == f'wnet://{NPIPE_HOST}/{DB_ALIAS}'
     dsn = driver.core._connect_helper(None, NPIPE_HOST, SVC_NAME, DB_WIN_PATH, NetProtocol.WNET)
-    assert dsn == f'wnet://{NPIPE_HOST}:{SVC_NAME}{DB_WIN_PATH}'
+    assert dsn == f'wnet://{NPIPE_HOST}:{SVC_NAME}/{DB_WIN_PATH}'
 
 def test_connect_dsn(dsn, db_file):
     with connect(dsn) as con:
@@ -130,7 +130,6 @@ def test_connect_config(fb_vars, db_file, driver_cfg):
         [test_db1]
         server = server.local
         database = {db_file}
-        utf8filename = true
         charset = UTF8
         sql_dialect = 3
         """
@@ -163,21 +162,22 @@ def test_connect_config(fb_vars, db_file, driver_cfg):
 
     if host:
         # protocols
-        # For protocol URLs with absolute paths, we need double slash to preserve leading /
-        # inet://host//absolute/path so Firebird doesn't strip the leading /
+        # For protocol URLs the path always needs a / separator:
+        # - Unix: inet://host//absolute/path (double slash to keep the leading /)
+        # - Windows: inet://host:port/D:\path (single slash before drive letter)
         if str(db_file).startswith('/'):
-            dsn = f'{host}:{port}/{db_file}'  # Extra / for absolute paths
+            proto_path = f'{host}:{port}/{db_file}'  # Extra / for Unix absolute paths
         else:
-            dsn = f'{host}:{port}{db_file}'
+            proto_path = f'{host}:{port}/{db_file}'  # Single / for Windows drive-letter paths
         cfg = driver_cfg.get_database('test_db1')
         cfg.protocol.value = NetProtocol.INET
         with connect('test_db1') as con:
             assert con._att is not None
-            assert con.dsn == f'inet://{dsn}'
+            assert con.dsn == f'inet://{proto_path}'
         cfg.protocol.value = NetProtocol.INET4
         with connect('test_db1') as con:
             assert con._att is not None
-            assert con.dsn == f'inet4://{dsn}'
+            assert con.dsn == f'inet4://{proto_path}'
 
 def test_properties(db_connection):
     con = db_connection # Use the fixture