tina4ruby 3.12.1 → 3.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90eb5ed01201959d94f88cc1fad8e0cb264f746e3ac78abb9067db625419feb
-  data.tar.gz: b1b401082f5a9be3485fdf797f5030eaf429d03f28da2ff9ff0feb8453112eaa
+  metadata.gz: a97e5249b5ffd22de2dac45ce08f27e217c9c1253192d41b036b0ef90e14dc11
+  data.tar.gz: d2a67f3f7a4e11dab682f2333e4aed920ada9ba553737c5c77899ed3b7bf8cd2
 SHA512:
-  metadata.gz: ae0b2c4b1817a8447e9c1ebb70bc040fe862e04d879821f157500d33da66bc50023eb844c865eb1166a7868362059080cd6de7fe22f4c21d000beb5121c27289
-  data.tar.gz: 5ba99259a5b3c2073fa7a3dc4d4c65215478132e5254cecce6c9f270ccccb195ad557d5187d1e42e85b1f805311961032523a4f19bb1951a73c74f88053f86e1
+  metadata.gz: beb243e57f2aa6df523fe64e63c2057a46058d711acda139342ca06144fd207949e24a3a35d25787d1f110bf7bead2cd85178c1cefb0c8158e46be89e7f31004
+  data.tar.gz: dd2169f5c8837fe90185e9c81eb5bd6e5fa49819230cf6ec79207f32aa6288a6eaec80236d565d7a0b561d08a95f7c0949456d21abd8ac887425c54ac7fe1997

data/lib/tina4/drivers/firebird_driver.rb

@@ -19,20 +19,95 @@ module Tina4
         "broken pipe"
       ].freeze
 
+      # Detects a Windows drive-letter prefix like "C:/" or "C:\". The leading-slash
+      # variant ("/C:/...") shows up after URI.parse strips one slash off
+      # "firebird://host:port/C:/...".
+      WIN_DRIVE_RE = %r{\A/?[A-Za-z]:[/\\]}.freeze
+
+      # Turn the URL path component into a Firebird database identifier.
+      #
+      # Firebird is the awkward one — it needs either an absolute file path
+      # on the server, a Windows drive-letter path, or an alias name. The
+      # classic URI form uses a double-slash to keep the leading "/" of an
+      # absolute path through URI.parse:
+      #
+      #     firebird://host:port//firebird/data/app.fdb   →  /firebird/data/app.fdb
+      #
+      # But that double slash is unintuitive to anyone used to the way
+      # postgres / mysql / mssql encode the database name. We accept five
+      # equivalent forms and normalise all of them:
+      #
+      # * "//abs/path/db.fdb"    → "/abs/path/db.fdb"    (classic double-slash)
+      # * "/abs/path/db.fdb"     → "/abs/path/db.fdb"    (single-slash, what most people type)
+      # * "/C:/Data/db.fdb"      → "C:/Data/db.fdb"      (Windows, leading URL slash dropped)
+      # * "/C%3A/Data/db.fdb"    → "C:/Data/db.fdb"      (Windows with URL-encoded colon)
+      # * "/employee"            → "employee"            (alias — single token)
+      #
+      # Aliases are detected as the leftover case: a single token with no
+      # slashes. Anything path-like is kept as a path.
+      def self.normalize_db_identifier(raw_path)
+        require "uri"
+        return "" if raw_path.nil? || raw_path.empty?
+
+        decoded = URI.decode_www_form_component(raw_path)
+
+        # Classic double-slash form: //abs/path → /abs/path
+        decoded = decoded[1..] if decoded.start_with?("//")
+
+        # Windows drive-letter — drop the URL-introduced leading slash.
+        # /C:/Data/db.fdb → C:/Data/db.fdb
+        if WIN_DRIVE_RE.match?(decoded)
+          decoded = decoded[1..] if decoded.start_with?("/")
+          return decoded
+        end
+
+        # Look at the content after stripping the leading slash. If it's a
+        # single token with no separators, it's a Firebird alias — return
+        # WITHOUT the leading slash (the alias name itself is the identifier).
+        body = decoded.start_with?("/") ? decoded[1..] : decoded
+        if !body.empty? && !body.include?("/") && !body.include?("\\")
+          return body
+        end
+
+        # Otherwise it's a file path. If it already has a leading slash,
+        # keep it. If it's a relative-looking path (slash-separated but no
+        # leading "/") promote it to absolute — Firebird needs absolute paths
+        # and we don't know the server's CWD anyway.
+        decoded.start_with?("/") ? decoded : "/#{decoded}"
+      end
+
       def connect(connection_string, username: nil, password: nil)
         require "fb"
         require "uri"
         uri = URI.parse(connection_string)
         host = uri.host
         port = uri.port || 3050
-        db_path = uri.path&.sub(/^\//, "")
         db_user = username || uri.user
         db_pass = password || uri.password
 
+        # Firebird database identifier resolution — two layers:
+        #
+        # 1. TINA4_DATABASE_FIREBIRD_PATH env override wins if set.
+        #    Useful for Windows users with raw backslash paths (no URL
+        #    encoding required) and for ops setups that keep server URL
+        #    and DB location in separate config layers.
+        # 2. Otherwise normalise the URL path component — accepts every
+        #    sensible variant (single/double slash, drive letter, alias).
+        env_override = ENV["TINA4_DATABASE_FIREBIRD_PATH"].to_s
+        db_path = if !env_override.empty?
+                    env_override
+                  else
+                    self.class.normalize_db_identifier(uri.path.to_s)
+                  end
+
         database = if host
                      "#{host}/#{port}:#{db_path}"
                    else
-                     db_path || connection_string.sub(/^firebird:\/\//, "")
+                     # No host → fall back to the raw identifier (or, for
+                     # totally non-URL inputs, strip the scheme prefix).
+                     return_path = db_path
+                     return_path = connection_string.sub(/^firebird:\/\//, "") if return_path.empty?
+                     return_path
                    end
 
         # Cache for transparent reconnect — never logged, lives only in

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.12.1"
+  VERSION = "3.12.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.12.2
 platform: ruby
 authors:
 - Tina4 Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-04 00:00:00.000000000 Z
+date: 2026-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack