tina4ruby 3.13.128 → 3.13.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a254da7848fb136bf9c014d3ac291c31b9046ee2ad7bd40222189f5d8e031b
-  data.tar.gz: e9a23c45ec6b6c3ff46125454259447e743ffe6097a7866f486c6b5a8cc5aaad
+  metadata.gz: e0792f247e0fc7d10a52db84896d8cd475d509e258a1b121b06564e45cfa3913
+  data.tar.gz: 91ecd21265adabfd4874596c68b63f10c36bab1cb39fd49c4be4b0db1d8ec289
 SHA512:
-  metadata.gz: dd3e42f53f1515ddfb137cd6713a11650309d4da359030cecde6be6368cad5309175b04943b25fa8bc5349e6b8505c2231a128b7de3c905c7a5605bf4d71c454
-  data.tar.gz: 81c929c2b3b06ce99682c440e1ce6385cb2bda7d836638e158fd0c0d2bcc41526eb7b7e055159c9aeab38468a16843d05b77b57f76beec525dab16ccc8cf9dec
+  metadata.gz: a464c761ff621eeb3a10068a1ad436fe1b71d1403792885a07442b1f8dc475d80c1f64736e3a456c2a71edd72c0fee6fabd215e8fb61e6eb543e2d2b02531831
+  data.tar.gz: 86c6e9cb683134790b85159c797225c3bb8d126fe8fbc1d0bfc8d0f3aeaf1dfcf781b5a21ae4d8cf414c04875726a32db98cc5cfd12b87b10603e815d805e17a

data/lib/tina4/cli.rb

@@ -30,7 +30,7 @@ module Tina4
     # handlers take (name, flags); COMMANDS handlers take (argv).
 
     GENERATORS = {
-      "model"      => { handler: :generate_model,      usage: '<Name> [--fields "name:string,price:float"]', summary: "ORM model + matching migration" },
+      "model"      => { handler: :generate_model,      usage: '<Name> [--fields "name:string,price:float"] [--table-name <name>]', summary: "ORM model + matching migration" },
       "route"      => { handler: :generate_route,      usage: "<name> [--model Name] [--public]",             summary: "CRUD route file, secure by default (--public opens writes)" },
       "crud"       => { handler: :generate_crud,       usage: '<Name> [--fields "..."] [--public]',           summary: "Model + migration + routes + form + view + test" },
       "migration"  => { handler: :generate_migration,  usage: "<description>",                                 summary: "Timestamped migration file (UP/DOWN)" },
@@ -284,6 +284,52 @@ module Tina4
       pluralize_table(to_snake_case(name))
     end
 
+    # The table name a generator uses, honouring `--table-name` and speaking up
+    # instead of renaming silently (issue #123). Mirrors `_resolve_table` in
+    # tina4-python/tina4_python/cli/__init__.py:98.
+    #
+    # `announce` prints the note/warning; it is TRUE only for `generate_model`
+    # (where the table is born). Composite generators (crud) let the model
+    # sub-call announce, and generators that target an EXISTING table
+    # (seeder/form/view) still honour `--table-name` but stay quiet so the note
+    # is not repeated. `build_model_resolution` calls it with announce:false too,
+    # so the envelope's table_name/migration_path equal what lands on disk.
+    #
+    # * `--table-name <name>` wins verbatim. If that name is ITSELF a reserved
+    #   word, warn loudly: Tina4 interpolates table names UNQUOTED, so the ORM's
+    #   generated SQL will fail on it and quoting it in raw SQL + migrations is
+    #   now the developer's job (we do NOT silently quote — identifier quoting is
+    #   a global storage invariant, not a local fix).
+    # * Otherwise fall back to `to_table_name`. When that auto-pluralises a
+    #   reserved-word class name (Order -> orders), print a one-line note naming
+    #   the rename and the `--table-name` escape hatch, so the developer is
+    #   informed rather than surprised.
+    def resolve_table(name, flags = {}, announce: false)
+      flags ||= {}
+      override = flags["table-name"]
+      # A real value only — a bare `--table-name` parses to `true` and an empty
+      # `--table-name ""` to "", both of which fall through to the pluralise path
+      # (parity with Python's `if override and not isinstance(override, bool)`).
+      if override.is_a?(String) && !override.empty?
+        if announce && SQL_RESERVED_TABLE_NAMES.include?(to_snake_case(override))
+          puts "  ! table_name '#{override}' is a SQL reserved word. Tina4 interpolates " \
+               "table names UNQUOTED, so the ORM's generated SQL will fail on it -- " \
+               "quote it yourself in raw SQL and migrations."
+        end
+        return override
+      end
+      bare = to_snake_case(name)
+      if SQL_RESERVED_TABLE_NAMES.include?(bare)
+        table = pluralize_table(bare)
+        if announce
+          puts "  · '#{bare}' is a SQL reserved word; using table_name '#{table}' " \
+               "(Tina4 interpolates table names unquoted). Override with --table-name <name>."
+        end
+        return table
+      end
+      bare
+    end
+
     # Called without --fields, the generators fall back to a single `name`
     # string column. That default MUST be materialised here, in one place, and
     # then flow into the model, the migration, the form, the view and the spec
@@ -1616,21 +1662,19 @@ module Tina4
 
     def build_model_resolution(name, flags)
       raw = to_snake_case(name)
+      # Honour --table-name (silent here; generate_model announces). The envelope
+      # thus reports the SAME table_name/migration_path the generator writes.
+      table = resolve_table(name, flags)
       transformations = []
-      table =
-        if SQL_RESERVED_TABLE_NAMES.include?(raw)
-          plural = pluralize_table(raw)
-          transformations << {
-            "kind"     => "reserved_word_pluralize",
-            "from"     => raw,
-            "to"       => plural,
-            "reason"   => "SQL reserved word '#{raw}' would break CREATE TABLE",
-            "override" => "--table #{raw} --quote (requires quoted-identifier mode, not yet implemented)"
-          }
-          plural
-        else
-          raw
-        end
+      if SQL_RESERVED_TABLE_NAMES.include?(raw) && raw != table
+        transformations << {
+          "kind"     => "reserved_word_pluralize",
+          "from"     => raw,
+          "to"       => table,
+          "reason"   => "SQL reserved word '#{raw}' would break CREATE TABLE",
+          "override" => "--table-name <name> (table names interpolate unquoted; forcing a reserved name is yours to quote in raw SQL)"
+        }
+      end
       # The migration filename embeds a timestamp; predict it deterministically
       # so a `--dry-run` and the real run agree on the same second. Two
       # generations within the same second collide anyway (existing behaviour).
@@ -1797,8 +1841,9 @@ module Tina4
       pluralized = resolution["transformations"].find { |t| t["kind"] == "reserved_word_pluralize" }
       if pluralized
         lines << ""
-        lines << "  To keep the raw name '#{pluralized['from']}' as the table:"
-        lines << "    tina4ruby generate #{target} #{name} --table #{pluralized['from']} --quote  (opt-in, ADR-0062 forthcoming)"
+        lines << "  To set the table name yourself:"
+        lines << "    tina4ruby generate #{target} #{name} --table-name <name>"
+        lines << "  Tina4 interpolates table names unquoted; if you force the reserved '#{pluralized['from']}', you own the quoting in raw SQL."
       end
       # ADR-0063 v1.1: surface `edit_hints[]` under "Edit these lines:" and
       # `next[]` under "Next:" — both additive; missing / empty arrays elide
@@ -1847,7 +1892,9 @@ module Tina4
 
     def generate_model(name, flags, emit_test: true)
       fields = fields_or_default(flags["fields"])
-      table = to_table_name(name)
+      # announce: this is where the table is born, so a reserved-word pluralise
+      # (Order -> orders) or a forced reserved --table-name speaks up (#123).
+      table = resolve_table(name, flags, announce: true)
       snake = to_snake_case(name)
 
       # Build field lines
@@ -2093,7 +2140,8 @@ module Tina4
     # ── Generator: crud ──────────────────────────────────────────────────
 
     def generate_crud(name, flags)
-      table = to_table_name(name)
+      # Quiet here — the generate_model sub-call below announces once (#123).
+      table = resolve_table(name, flags)
       # Always derive the plural route from the CLASS NAME, not by appending
       # "s" to the table — otherwise a reserved-word table (already plural,
       # Order -> orders) becomes orderss, and a `y`-ending class (Category)
@@ -2422,7 +2470,8 @@ module Tina4
 
     def generate_form(name, flags = {})
       fields = fields_or_default(flags["fields"])
-      table = to_table_name(name)
+      # Targets an existing table — honour --table-name but stay quiet (#123).
+      table = resolve_table(name, flags)
       route_name = to_route_name(name)
 
       # Input type mapping
@@ -2505,7 +2554,8 @@ module Tina4
 
     def generate_view(name, flags = {})
       fields = fields_or_default(flags["fields"])
-      table = to_table_name(name)
+      # Targets an existing table — honour --table-name but stay quiet (#123).
+      table = resolve_table(name, flags)
       route_name = to_route_name(name)
 
       cols = fields.map { |f, _| f }
@@ -2938,7 +2988,8 @@ module Tina4
     #
     #   tina4ruby generate seeder Product
     def generate_seeder(name, flags = {})
-      table = to_table_name(name)
+      # Targets an existing table — honour --table-name but stay quiet (#123).
+      table = resolve_table(name, flags)
       model_snake = to_snake_case(name)
       dir = "seeds"
       FileUtils.mkdir_p(dir)

data/lib/tina4/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.128
+  version: 3.13.129
 platform: ruby
 authors:
 - Tina4 Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-31 00:00:00.000000000 Z
+date: 2026-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack