tina4ruby 3.13.124 → 3.13.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2721edc599a657e8b0e1148215366e11f39c49ee81c8cd3e7a97bec295a558e4
-  data.tar.gz: 95e143bba0cd72ef76df8bccb15d917a5cc26d09f57e6d23780a7db8a55a3ff9
+  metadata.gz: 8b117f25af22a6186fdba82880a24d055a80558f7273d239b9c7478e51b9393d
+  data.tar.gz: 0bfb76f6503a503bf19be89cdcf16959a77ffc4d11784f4a519628945e38d4cd
 SHA512:
-  metadata.gz: d20ba3ce28b1333d78736a62bc62c938493ee227dc8cee356e35f820c996636111300310501a1ccac272b159163ce5c40cf099c236c1c2aa990be1316c654f59
-  data.tar.gz: 6ec1241bb4c480869f1def2131c385e5bb03e7264171a36c62a74282ada9558b6a758a92673c29f09cd88c32c502dbe11e6079fdc5b58f2620ae2c49c74f2db9
+  metadata.gz: abb84fe5bc77b49b53ef8b6d6ef5139782a5bed7103f88377329a56ef07a376ba3003aecf6d9d3fdd4de4c073ef306b7c467e982acaa6bb451f308e7cf70f13b
+  data.tar.gz: 8c760af751f9b0eaee5f659bc90ca5f78505d93b343f89dcdb786fc8404e6376d49800ed05ca39e1c6fa7047d3ed9f0fb0b79480898804d98f1c672893b129c4

data/lib/tina4/cli.rb

@@ -143,7 +143,7 @@ module Tina4
       "bool"     => { orm: "boolean_field", sql: "INTEGER",      default: "0" },
       "boolean"  => { orm: "boolean_field", sql: "INTEGER",      default: "0" },
       "text"     => { orm: "string_field",  sql: "TEXT",         default: "''" },
-      "datetime" => { orm: "string_field",  sql: "TEXT",         default: "NULL" },
+      "datetime" => { orm: "string_field",  sql: "TIMESTAMP",         default: "NULL" },
       "blob"     => { orm: "string_field",  sql: "BLOB",         default: "NULL" },
     }.freeze
 
@@ -2051,7 +2051,7 @@ module Tina4
           default = info[:default] != "NULL" ? " DEFAULT #{info[:default]}" : ""
           col_lines << "    #{fname} #{info[:sql]}#{default}"
         end
-        col_lines << "    created_at TEXT DEFAULT CURRENT_TIMESTAMP"
+        col_lines << "    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP"
 
         # ADR-0063: `-- tina4:edit` marker for the SQL scanner (mirrors `# tina4:edit`
         # in Ruby files). The scanner regex accepts both comment prefixes.

data/lib/tina4/drivers/firebird_driver.rb

@@ -231,6 +231,17 @@ module Tina4
       end
 
       def execute(sql, params = [])
+        # Translate SQLite-canonical DDL to Firebird at APPLY time, mirroring the
+        # Python master's firebird.py _translate_sql: strip AUTOINCREMENT (Firebird
+        # uses generators), then rewrite the types Firebird rejects -- TEXT ->
+        # BLOB SUB_TYPE TEXT (-607), REAL -> DOUBLE PRECISION -- and drop
+        # CREATE TABLE IF NOT EXISTS. Both helpers only touch DDL keywords
+        # (AUTOINCREMENT / CREATE TABLE / ALTER TABLE), so a plain
+        # INSERT/UPDATE/DELETE/SELECT is returned untouched. This is what lets a
+        # REALLY-generated migration (id INTEGER PRIMARY KEY AUTOINCREMENT,
+        # bio TEXT, price REAL) apply on Firebird instead of raising -607/-104.
+        sql = Tina4::SQLTranslator.auto_increment_syntax(sql, "firebird")
+        sql = Tina4::SQLTranslator.ddl_types(sql, "firebird")
         result = with_reconnect do
           if params.empty?
             @connection.execute(sql)

data/lib/tina4/drivers/mssql_driver.rb

@@ -59,6 +59,14 @@ module Tina4
       end
 
       def execute(sql, params = [])
+        # Translate SQLite-canonical DDL to T-SQL at APPLY time, mirroring the
+        # Python master's mssql.py _translate_sql: AUTOINCREMENT -> IDENTITY(1,1),
+        # then strip CREATE TABLE IF NOT EXISTS (not T-SQL) and map TIMESTAMP ->
+        # DATETIME2 (MSSQL's TIMESTAMP is a rowversion, not a datetime). Both
+        # helpers only touch DDL keywords, so DML is returned untouched -- this is
+        # what lets a REALLY-generated migration apply on MSSQL.
+        sql = Tina4::SQLTranslator.auto_increment_syntax(sql, "mssql")
+        sql = Tina4::SQLTranslator.ddl_types(sql, "mssql")
         effective_sql = interpolate_params(sql, params)
 
         # Capture the generated IDENTITY AT WRITE TIME — mirror of the Python

data/lib/tina4/drivers/mysql_driver.rb

@@ -73,7 +73,15 @@ module Tina4
       # wiring that makes the previously-dead concat/ilike helpers live in Ruby.)
       def translate_dialect(sql)
         sql = Tina4::SQLTranslator.concat_pipes_to_func(sql)
-        Tina4::SQLTranslator.ilike_to_like(sql)
+        sql = Tina4::SQLTranslator.ilike_to_like(sql)
+        # Complete the DDL dialect translation at APPLY time, mirroring the Python
+        # master's mysql.py _translate_sql: AUTOINCREMENT -> AUTO_INCREMENT, then
+        # map a datetime column's TIMESTAMP -> DATETIME (MySQL's TIMESTAMP carries
+        # auto-update + 2038 surprises). Both helpers only touch DDL keywords, so a
+        # SELECT/INSERT is returned untouched -- this is what lets a
+        # REALLY-generated migration apply on MySQL.
+        sql = Tina4::SQLTranslator.auto_increment_syntax(sql, "mysql")
+        Tina4::SQLTranslator.ddl_types(sql, "mysql")
       end
 
       def execute_query(sql, params = [])

data/lib/tina4/sql_translator.rb

@@ -233,6 +233,52 @@ module Tina4
         end
       end
 
+      # Translate SQLite-canonical DDL column TYPES + CREATE-TABLE options to the
+      # target engine.
+      #
+      # ONLY acts on +CREATE TABLE+ / +ALTER TABLE+ statements, so a query or
+      # INSERT that happens to contain the word +TEXT+ (a column name, a string
+      # literal) is never rewritten. Complements +auto_increment_syntax+ (which
+      # maps the id keyword) so ONE portable migration -- and every
+      # +ORM.create_table+ DDL, which is also SQLite-canonical -- applies on every
+      # engine instead of failing on Firebird/MSSQL.
+      #
+      # * Firebird has no +TEXT+ (-607), no +REAL+, and no
+      #   +CREATE TABLE IF NOT EXISTS+.
+      # * MSSQL has no +CREATE TABLE IF NOT EXISTS+ and its +TIMESTAMP+ is a
+      #   rowversion, not a datetime -- a +created_at TIMESTAMP+ there is wrong.
+      # * MySQL's +TIMESTAMP+ carries auto-update / 2038 surprises, so a datetime
+      #   column maps to +DATETIME+ (matching ORM.create_table).
+      #
+      # @param sql [String]
+      # @param engine [String] firebird, mssql, mysql (others pass through)
+      # @return [String]
+      def ddl_types(sql, engine)
+        # Gate to DDL only, tolerating leading `-- ...` comment lines / blank
+        # lines that a migration file carries before its CREATE TABLE. A SELECT
+        # or INSERT that merely mentions a type keyword is never rewritten.
+        head = sql.sub(/\A(?:\s*--[^\n]*\n)+/, "")
+        return sql unless head =~ /\A\s*(?:CREATE\s+TABLE|ALTER\s+TABLE)\b/i
+
+        case engine.to_s.downcase
+        when "firebird"
+          sql = sql.gsub(/\bIF\s+NOT\s+EXISTS\b/i, "")
+          # Map bare TEXT -> BLOB SUB_TYPE TEXT, but leave an existing
+          # "BLOB SUB_TYPE TEXT" intact (it already contains the word TEXT).
+          sql = sql.gsub(/\bBLOB\s+SUB_TYPE\s+TEXT\b/i, "\x00FBTEXT\x00")
+          sql = sql.gsub(/\bTEXT\b/i, "BLOB SUB_TYPE TEXT")
+          sql = sql.gsub("\x00FBTEXT\x00", "BLOB SUB_TYPE TEXT")
+          sql.gsub(/\bREAL\b/i, "DOUBLE PRECISION")
+        when "mssql"
+          sql = sql.gsub(/\bIF\s+NOT\s+EXISTS\b/i, "")
+          sql.gsub(/\bTIMESTAMP\b/i, "DATETIME2")
+        when "mysql"
+          sql.gsub(/\bTIMESTAMP\b/i, "DATETIME")
+        else
+          sql
+        end
+      end
+
       # NOTE (SQLTRANS-DEC-02): +placeholder_style+ was removed - every Ruby
       # driver owns its own placeholder shape (+?+ for MySQL/SQLite/MSSQL/Firebird,
       # +$1+ for Postgres), so this helper had zero callers and disagreed with the

data/lib/tina4/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.124
+  version: 3.13.125
 platform: ruby
 authors:
 - Tina4 Team