tina4ruby 3.13.124 → 3.13.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2721edc599a657e8b0e1148215366e11f39c49ee81c8cd3e7a97bec295a558e4
-  data.tar.gz: 95e143bba0cd72ef76df8bccb15d917a5cc26d09f57e6d23780a7db8a55a3ff9
+  metadata.gz: f56bea80e9f63a3326a77f8903721890f45a2db216f39c24fe51c1363e0514b9
+  data.tar.gz: 61dd38932bcfb406abb603232dd584889223408888d3ca7aaa469775243727b7
 SHA512:
-  metadata.gz: d20ba3ce28b1333d78736a62bc62c938493ee227dc8cee356e35f820c996636111300310501a1ccac272b159163ce5c40cf099c236c1c2aa990be1316c654f59
-  data.tar.gz: 6ec1241bb4c480869f1def2131c385e5bb03e7264171a36c62a74282ada9558b6a758a92673c29f09cd88c32c502dbe11e6079fdc5b58f2620ae2c49c74f2db9
+  metadata.gz: d6ca97a0dcb6adf6776f89be49871d814b678a3d499d8ec740a6b87516af474f04d1e78d2c8746a113aa8877c2b3fcceec4ebd2f9d3cc02b2f4fd0accc63d095
+  data.tar.gz: 5c86231d8853e00c5cbbdf22a6ea02d477eed2fe045306c498ed1b82eff9ba5bc9c1e301b53f99a394f82731001c56503615206d566e2266b6e4208c2d64aecb

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/dev_admin.rb

@@ -1385,7 +1385,9 @@ module Tina4
           # the closure, not a dead keyword.
           fake = Tina4::FakeData.new(seed: seed)
           field_map = Tina4._normalize_columns(db.columns(table_name)).each_with_object({}) do |(col_name, type_sym), map|
-            map[col_name] = -> { fake.for_field({ type: type_sym }, col_name) }
+            # Thread the TABLE name so a generic name column on a product-ish
+            # table seeds a product name (parity with the seed_table path).
+            map[col_name] = -> { fake.for_field({ type: type_sym }, col_name, table_name) }
           end
           # Delegate to the shared resilient seed_table helper so the endpoint
           # gets the exact same per-row wrap (P1) — no unhandled row failure can

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/seeder.rb

@@ -108,6 +108,30 @@ module Tina4
     CURRENCIES = %w[USD EUR GBP JPY CAD AUD CHF ZAR INR CNY].freeze
     CREDIT_CARD_PREFIXES = %w[4111 4242 5500 5105].freeze
 
+    # Product-name vocabulary (adjective + noun). Seeds a generic
+    # +name+/+full_name+ column on a product-ish table with "Wireless Keyboard"
+    # instead of a person name. Mirrors the Python master's word banks.
+    PRODUCT_ADJECTIVES = %w[
+      Wireless Organic Premium Classic Eco Smart Portable
+      Deluxe Compact Rustic Handcrafted Vintage Modern
+      Ergonomic Stainless Bamboo Recycled Artisan Professional
+      Ultra Insulated Lightweight Adjustable Foldable
+    ].freeze
+
+    PRODUCT_NOUNS = [
+      "Keyboard", "Coffee Beans", "Backpack", "Water Bottle", "Desk Lamp",
+      "Headphones", "Notebook", "Sneakers", "Sunglasses", "Wallet", "Mug",
+      "Chair", "Blender", "Speaker", "Charger", "Umbrella", "Toothbrush",
+      "Jacket", "Watch", "Kettle", "Picture Frame", "Planter", "Cutlery Set",
+      "Yoga Mat", "Phone Case"
+    ].freeze
+
+    # A table/model whose name contains any of these gets product names on its
+    # generic +name+/+full_name+ column instead of a person name.
+    PRODUCT_TABLE_HINTS = %w[
+      product item catalog inventory goods merchandise sku listing stock ware
+    ].freeze
+
     def initialize(seed: nil)
       @rng = seed ? Random.new(seed) : Random.new
     end
@@ -247,6 +271,23 @@ module Tina4
       JOB_TITLES[@rng.rand(JOB_TITLES.length)]
     end
 
+    # A plausible product name, e.g. "Wireless Keyboard" or "Organic Coffee
+    # Beans". Deterministic under a seed like every other generator (draws from
+    # the same @rng), so a seeded run reproduces it. Mirrors the Python master's
+    # FakeData.product().
+    def product
+      "#{PRODUCT_ADJECTIVES[@rng.rand(PRODUCT_ADJECTIVES.length)]} #{PRODUCT_NOUNS[@rng.rand(PRODUCT_NOUNS.length)]}"
+    end
+
+    # True when the table/model name looks like a product catalogue, so a generic
+    # +name+/+full_name+ column seeds a product name, not a person name. With no
+    # table context (nil/"") this is false, so the person-name default is kept
+    # (back-compat). Mirrors the Python master's +_is_product_table+.
+    def self.product_table?(table)
+      down = table.to_s.downcase
+      PRODUCT_TABLE_HINTS.any? { |hint| down.include?(hint) }
+    end
+
     def currency
       CURRENCIES[@rng.rand(CURRENCIES.length)]
     end
@@ -282,7 +323,13 @@ module Tina4
     end
 
     # Generate appropriate data based on field definition and column name.
-    def for_field(field_def, column_name = nil)
+    #
+    # +table+ (optional) is the table/model name. When it names a product-ish
+    # catalogue (see FakeData.product_table?) a generic +name+/+full_name+/
+    # +fullname+ column yields a product name ("Wireless Keyboard") instead of a
+    # person name. With no table context the person-name default is kept
+    # (back-compat). first_name/last_name/user_name stay person either way.
+    def for_field(field_def, column_name = nil, table = nil)
       col = (column_name || "").to_s.downcase
       type = field_def[:type]
 
@@ -323,7 +370,7 @@ module Tina4
 
       when :string, :text
         max_len = field_def[:length] || 255
-        val = generate_string_for(col, max_len)
+        val = generate_string_for(col, max_len, table)
         val.length > max_len ? val[0...max_len] : val
 
       else
@@ -333,9 +380,15 @@ module Tina4
 
     private
 
-    def generate_string_for(col, max_len)
+    def generate_string_for(col, max_len, table = nil)
       return email[0...max_len] if col.include?("email")
-      return name[0...max_len] if %w[name full_name fullname display_name].include?(col)
+      if %w[name full_name fullname display_name].include?(col)
+        # GENERIC full-name column: a product-ish table gets a product name, any
+        # other table (or no table context) keeps the person name. first_name/
+        # last_name/user_name are handled by the branches below, so they stay
+        # person on a product table too.
+        return (self.class.product_table?(table) ? product : name)[0...max_len]
+      end
       return first_name[0...max_len] if col.include?("first") && col.include?("name")
       return last_name[0...max_len] if col.include?("last") && col.include?("name")
       return last_name[0...max_len] if col =~ /surname|family_name/
@@ -523,7 +576,10 @@ module Tina4
           elsif fk_pools[name] && !fk_pools[name].empty?
             attrs[name] = fake.choice(fk_pools[name])
           else
-            generated = fake.for_field(field_def, name)
+            # Thread the MODEL name (orm_class.name) so a generic name column on
+            # a product-ish model seeds a product name (parity with the Python
+            # master, which passes orm_class.__name__).
+            generated = fake.for_field(field_def, name, orm_class.name)
             attrs[name] = generated unless generated.nil?
           end
         end
@@ -614,7 +670,10 @@ module Tina4
             row[col_name] = type_str.arity.zero? ? type_str.call : type_str.call(fake)
           else
             field_def = { type: type_str.to_sym }
-            row[col_name] = fake.for_field(field_def, col_name)
+            # Thread the TABLE name so a generic name column on a product-ish
+            # table (incl. the MCP seed_table dev tool, which reaches here via
+            # db.columns) seeds a product name instead of a person name.
+            row[col_name] = fake.for_field(field_def, col_name, table_name)
           end
         end
 

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.126"
 end

metadata

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