tina4ruby 3.13.53 → 3.13.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79a09ae5dffe2688af3e75a98dcf999929a1c560f3d8afbdc874590d6dfca275
-  data.tar.gz: 92d0d0b44f0e103a3f8ac894c620b075446bab88040d865095e7b9c23ea421fe
+  metadata.gz: ad240221da05e1d22971216907aeffa2699c0bd5eae3b3e4b8aa0479bd2ee1e7
+  data.tar.gz: ef7821e3dc9d26d45b242fdaad3c8edb79960dcc9229012ec3a04298157e1336
 SHA512:
-  metadata.gz: 128df90a6f281fefb62fc1e49e3075c52474d2c9f70cddc992e1c68a083b8dff38e9c6d014ffec0019736719f49bc2f80cb93eb2f3dff2b3deb336845db1f0e2
-  data.tar.gz: c579de40838336727fd25581e8d4db17bd3c449034e4805ba29a8215be60f5344c7608152c6c21cc7258396525e1bc5aee86b12ec4927de62f1745f39797601d
+  metadata.gz: 8ff611bd9c3c98c90036a44bf4bb03152e6e7eb280861bb9a9536fa79fbfae35e32502af36bf39a987598f5194bc5eb3bc8a8ff7608ef2aec220404a20d66b45
+  data.tar.gz: ccd42641cb4756e6e78d14249b7a11d792f8d65e076a59c2e6055010341628f2246e86b8708da4dd8bda6f998dbf8b2342baf854d44b141a4ad70c075f8ae222

data/lib/tina4/migration.rb

@@ -185,9 +185,9 @@ module Tina4
             CREATE TABLE #{TRACKING_TABLE} (
               id INTEGER NOT NULL PRIMARY KEY,
               migration_name VARCHAR(500) NOT NULL UNIQUE,
-              description VARCHAR(500) DEFAULT '',
+              description VARCHAR(500),
               batch INTEGER NOT NULL DEFAULT 1,
-              executed_at VARCHAR(50) DEFAULT CURRENT_TIMESTAMP,
+              executed_at VARCHAR(50) NOT NULL,
               passed INTEGER NOT NULL DEFAULT 1
             )
           SQL
@@ -211,16 +211,16 @@ module Tina4
                       when "mssql", "sqlserver" then "id INTEGER IDENTITY(1,1) PRIMARY KEY"
                       else "id INTEGER PRIMARY KEY AUTOINCREMENT" # sqlite (default)
                       end
-          executed_at_column = %w[mssql sqlserver].include?(engine) ?
-            "executed_at DATETIME DEFAULT CURRENT_TIMESTAMP" :
-            "executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP"
+          # Canonical executed_at is a written VARCHAR(50) string (no
+          # CURRENT_TIMESTAMP default — a timestamp default on a VARCHAR is
+          # rejected by PostgreSQL/MySQL). recordMigration writes it explicitly.
           @db.execute(<<~SQL)
             CREATE TABLE #{TRACKING_TABLE} (
               #{id_column},
-              migration_name VARCHAR(255) NOT NULL UNIQUE,
-              description VARCHAR(255) DEFAULT '',
+              migration_name VARCHAR(500) NOT NULL UNIQUE,
+              description VARCHAR(500),
               batch INTEGER NOT NULL DEFAULT 1,
-              #{executed_at_column},
+              executed_at VARCHAR(50) NOT NULL,
               passed INTEGER NOT NULL DEFAULT 1
             )
           SQL
@@ -229,19 +229,34 @@ module Tina4
       end
     end
 
+    # Return a result row keyed by lower-case symbols. Firebird returns rows keyed
+    # by UPPERCASE string column names while SQLite/others return lower-case symbol
+    # keys, so the tracking-table reads below are normalised to one shape. Without
+    # this, `row[:migration_name]` is nil on Firebird and every applied migration
+    # is treated as pending and re-run.
+    def normalize_row(row)
+      return {} if row.nil?
+
+      source = row.respond_to?(:to_h) ? row.to_h : row
+      source.each_with_object({}) { |(k, v), h| h[k.to_s.downcase.to_sym] = v }
+    end
+
     def completed_migrations
       result = @db.fetch("SELECT migration_name FROM #{TRACKING_TABLE} WHERE passed = 1 ORDER BY id")
-      result.map { |r| r[:migration_name] }
+      result.map { |r| normalize_row(r)[:migration_name] }
     end
 
     def completed_migrations_with_batch
       result = @db.fetch("SELECT id, migration_name, batch FROM #{TRACKING_TABLE} WHERE passed = 1 ORDER BY id")
-      result.map { |r| { id: r[:id], migration_name: r[:migration_name], batch: r[:batch] } }
+      result.map do |r|
+        row = normalize_row(r)
+        { id: row[:id], migration_name: row[:migration_name], batch: row[:batch] }
+      end
     end
 
     def next_batch_number
-      result = @db.fetch_one("SELECT MAX(batch) as max_batch FROM #{TRACKING_TABLE} WHERE passed = 1")
-      (result && result[:max_batch] ? result[:max_batch].to_i : 0) + 1
+      result = normalize_row(@db.fetch_one("SELECT MAX(batch) as max_batch FROM #{TRACKING_TABLE} WHERE passed = 1"))
+      (result[:max_batch] ? result[:max_batch].to_i : 0) + 1
     end
 
     def pending_migrations
@@ -479,12 +494,22 @@ module Tina4
           next
         end
 
-        # Statement delimiter — only reached outside blocks/comments/strings.
+        # Statement delimiter — only reached outside blocks/comments/strings. A
+        # SET TERM directive switches the active terminator and is consumed
+        # (never emitted); any other completed statement is collected.
         if !delimiter.empty? && sql[i, dlen] == delimiter
+          i += dlen
           stmt = current.strip
-          statements << stmt unless stmt.empty?
           current = +""
-          i += dlen
+          unless stmt.empty?
+            new_term = parse_set_term(stmt)
+            if new_term
+              delimiter = new_term
+              dlen = delimiter.length
+            else
+              statements << stmt
+            end
+          end
           next
         end
 
@@ -492,11 +517,30 @@ module Tina4
         i += 1
       end
 
+      # Trailing statement (may not end with a delimiter). A trailing SET TERM
+      # directive is a no-op — consume it, don't emit it.
       stmt = current.strip
-      statements << stmt unless stmt.empty?
+      statements << stmt unless stmt.empty? || parse_set_term(stmt)
       statements
     end
 
+    # Return the new terminator from a `SET TERM <new> <current>` directive, or
+    # nil when +statement+ is not a SET TERM directive.
+    #
+    # SET TERM is a script-level directive (recognised by isql and other
+    # InterBase/Firebird tooling, not run by the engine) that changes the
+    # terminator separating statements. Recognising it lets a statement whose own
+    # body contains the default ";" terminator — a trigger, stored procedure or
+    # EXECUTE BLOCK — be kept intact rather than split on those inner ";". The
+    # terminator may be more than one character (e.g. "!!").
+    #
+    # @param statement [String] a single, already-stripped statement
+    # @return [String, nil] the new terminator, or nil when not a SET TERM directive
+    def parse_set_term(statement)
+      m = statement.strip.match(/\ASET\s+TERM\s+(\S+)\z/i)
+      m && m[1]
+    end
+
     def execute_sql_file(file)
       sql = File.read(file)
       statements = split_sql_statements(sql)
@@ -584,6 +628,9 @@ module Tina4
       # Extract description from filename (strip numeric prefix and extension)
       stem = File.basename(name, File.extname(name))
       desc = stem.sub(/\A\d+_/, "").tr("_", " ")
+      # executed_at is a written VARCHAR(50) string (canonical shape has no
+      # CURRENT_TIMESTAMP default), ISO-8601 UTC. strftime avoids a require "time".
+      executed_at = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
       if firebird?
         # Firebird: generate ID from sequence
         row = @db.fetch_one(
@@ -591,13 +638,13 @@ module Tina4
         )
         next_id = row ? (row[:NEXT_ID] || row[:next_id] || 1).to_i : 1
         @db.execute(
-          "INSERT INTO #{TRACKING_TABLE} (id, migration_name, description, batch, passed) VALUES (?, ?, ?, ?, ?)",
-          [next_id, name, desc, batch, passed]
+          "INSERT INTO #{TRACKING_TABLE} (id, migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, ?)",
+          [next_id, name, desc, batch, executed_at, passed]
         )
       else
         @db.execute(
-          "INSERT INTO #{TRACKING_TABLE} (migration_name, description, batch, passed) VALUES (?, ?, ?, ?)",
-          [name, desc, batch, passed]
+          "INSERT INTO #{TRACKING_TABLE} (migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?)",
+          [name, desc, batch, executed_at, passed]
         )
       end
     end

data/lib/tina4/version.rb

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

metadata

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