declare_schema 3.1.0.colin.1 → 3.1.0.colin.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6d94bcff3ece2896188d31c3e5cf4d66474ab4ef5082537037b9c037bfe364
-  data.tar.gz: fea64238065955c2a3b6a16f5d5f3ee1da5b65d09da8a808b5f11c66b575b602
+  metadata.gz: 1b65098860b02787bce136f3b694bcd294cdaaa6980716492bcf66b5ab9c4cc9
+  data.tar.gz: 9d8ff3e2e7c2cc06886f59b8052ab0f4b2d4bac88ea46ac4ada831000b6cb0a8
 SHA512:
-  metadata.gz: 675ddf024002056463139774a6cdca78f7b157f8de5e07978b945552858d462e3ba59284a42fe169f4395adb793ce4027207e272d721085c638987c49819a6cd
-  data.tar.gz: 667e85cc287311fa014a0729da207ec763749196b07a0692a746aaa5348e3f48d23fb18860b7ee0ce7a8b50b151a9003f0fb7f460e9b39ce5d14a72838adc0cd
+  metadata.gz: 9e7456ba8c763846255997c5fb08a77cb094a199abea888f13c39a9a5dea8e099fe1e09f2a017931eb3b8f1c1e2e7c46b8752dda2510e7f2a892c3f0d2a29a43
+  data.tar.gz: 38909be09762f69b40d245385bccf004520142838a95cd27f2c75ef0f82c292a65f301dda444b05e6ce30d76406f712f59c6a9160f8fea9588c1791d3448a8d3

data/.github/workflows/pipeline.yml

@@ -48,7 +48,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{matrix.ruby}}
-          bundler: 2.2.29
+          bundler: latest
           bundler-cache: true
       - name: Setup
         run: |

data/CHANGELOG.md

@@ -8,6 +8,9 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Added
 - Add HABTM support for arbitrary primary key in the referenced table (rather than just :bigint). 
 
+### Removed
+- Drop support for Rails 6.x. Minimum supported Rails is now 7.0.
+
 ## [3.0.0] - 2025-04-08
 ### Changed
 - The `timestamps` DSL method to create `created_at` and `updated_at` columns now defaults to `null: false` for `datetime` columns

data/Gemfile

@@ -15,7 +15,7 @@ gem 'mail'
 gem 'net-smtp'
 gem 'pry'
 gem 'pry-byebug'
-gem 'rails',            '~> 6.0'
+gem 'rails',            '~> 7.0'
 gem 'responders'
 gem 'rspec'
 gem 'rspec-its'

data/Gemfile.lock

@@ -1,126 +1,153 @@
 PATH
   remote: .
   specs:
-    declare_schema (3.1.0.colin.1)
-      rails (>= 6.0)
+    declare_schema (3.1.0.colin.2)
+      rails (>= 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      rack (~> 2.0, >= 2.0.9)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.3)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+      cgi
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      timeout (>= 0.4.0)
+    activestorage (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.3.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.5.0)
     bigdecimal (3.1.9)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
     byebug (11.1.3)
+    cgi (0.5.1)
     climate_control (0.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
+    connection_pool (3.0.2)
     crass (1.0.6)
-    date (3.3.4)
+    date (3.5.1)
     diff-lcs (1.5.1)
-    erubi (1.13.0)
+    drb (2.2.3)
+    erb (6.0.4)
+    erubi (1.13.1)
     ffi (1.17.0)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
+    logger (1.7.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.0)
+    mini_portile2 (2.8.9)
+    minitest (5.27.0)
     msgpack (1.7.2)
     mutex_m (0.3.0)
     mysql2 (0.5.6)
-    net-imap (0.4.14)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nio4r (2.7.5)
+    nokogiri (1.19.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.26.2)
@@ -128,54 +155,75 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.7)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
+    psych (5.3.1)
+      date
+      stringio
     racc (1.8.1)
-    rack (2.2.9)
-    rack-test (2.1.0)
+    rack (3.2.6)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rackup (2.3.1)
+      rack (>= 3)
+    rails (7.2.3.1)
+      actioncable (= 7.2.3.1)
+      actionmailbox (= 7.2.3.1)
+      actionmailer (= 7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actiontext (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.2.0)
+      railties (= 7.2.3.1)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      method_source
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
     regexp_parser (2.9.2)
+    reline (0.6.3)
+      io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.8)
+    rexml (3.4.4)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -206,25 +254,23 @@ GEM
     rubocop-ast (1.32.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
+    securerandom (0.4.1)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    thor (1.3.1)
-    timeout (0.4.1)
+    stringio (3.2.0)
+    thor (1.5.0)
+    timeout (0.6.1)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    websocket-driver (0.7.6)
+    useragent (0.16.11)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.36)
-    zeitwerk (2.6.17)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby
@@ -245,7 +291,7 @@ DEPENDENCIES
   pg (~> 1.1)
   pry
   pry-byebug
-  rails (~> 6.0)
+  rails (~> 7.0)
   responders
   rspec
   rspec-its

data/config/brakeman.ignore

@@ -3,11 +3,11 @@
     {
       "warning_type": "Command Injection",
       "warning_code": 14,
-      "fingerprint": "43f4448f6da2dd7f73909a4456c73c52f8f1d65e83bc188b9b3d624ba9470766",
+      "fingerprint": "069879c09668f26db81818bd906f169f4f3be6dc661c9b223fcd6f53b2155369",
       "check_name": "Execute",
       "message": "Possible command injection",
       "file": "lib/declare_schema/command.rb",
-      "line": 61,
+      "line": 55,
       "link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
       "code": "system(\"bundle exec rails #{Regexp.last_match(1)} declare_schema:#{(args * \" \")}\")",
       "render_path": null,
@@ -26,13 +26,13 @@
     {
       "warning_type": "Command Injection",
       "warning_code": 14,
-      "fingerprint": "6b90f8dd199afbdf79cc8c4d00a0853e0696b067d00c0fe93071e31b69de8628",
+      "fingerprint": "9914293cc386897d62f7f645fd2e0bfa51c582f3058ac34357f61b04866a33fe",
       "check_name": "Execute",
       "message": "Possible command injection",
       "file": "lib/declare_schema/command.rb",
       "line": 45,
       "link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
-      "code": "system(\"rails new #{\"new\"} #{(args * \" \")} -m #{File.join(Dir.tmpdir, \"declare_schema_app_template\")}#{begin\n  (require(\"mysql2\")\n  \" -d mysql\")\nrescue LoadError\n  # do nothing\nend}\")",
+      "code": "system(\"rails new #{\"new\"} #{(args * \" \")} -m #{File.join(Dir.tmpdir, \"declare_schema_app_template\")}\")",
       "render_path": null,
       "location": {
         "type": "method",
@@ -66,6 +66,6 @@
       "note": ""
     }
   ],
-  "updated": "2023-07-02 21:29:31 -0700",
+  "updated": "2026-05-02 06:56:54 -0700",
   "brakeman_version": "5.4.1"
 }

data/declare_schema.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 6.0'
+  s.add_dependency 'rails', '>= 7.0'
 end

data/lib/declare_schema/model/field_spec.rb

@@ -46,12 +46,13 @@ module DeclareSchema
         define_method(option) { @options[option] }
       end
 
-      def initialize(model, name, type, position: 0, **options)
+      def initialize(model, name, type, position: 0, resolver: nil, **options)
         @model = model
         @name = name.to_sym
         type.is_a?(Symbol) or raise ArgumentError, "type must be a Symbol; got #{type.inspect}"
         @type = TYPE_SYNONYMS[type] || type
         @position = position
+        @resolver = resolver
         @options = options.dup
 
         @options.has_key?(:null) or @options[:null] = ::DeclareSchema.default_null
@@ -120,7 +121,14 @@ module DeclareSchema
         @sql_options = @options.slice(*SQL_OPTIONS)
       end
 
-      def foreign_key_field_spec(model, name, position: 0, null: nil)
+      # Returns the final FieldSpec, invoking the deferred-resolution callback if one
+      # was supplied. Specs without a `resolver:` simply return `self`. Result is
+      # memoized so repeated calls (e.g. across migration generation passes) are cheap.
+      def resolve
+        @resolved ||= @resolver ? @resolver.call(self) : self
+      end
+
+      def foreign_key_field_spec(model, name, position:, null:)
         self.class.new(model, name, @type, position:, **@options.merge(null.nil? ? {} : { null: }))
       end
 

data/lib/declare_schema/model/habtm_model_shim.rb

@@ -39,15 +39,42 @@ module DeclareSchema
         join_table
       end
 
+      # The migrator (in change_column_back / add_column_back / etc.) wraps column
+      # introspection in `with_previous_model_table_name`, which expects a model that
+      # exposes `table_name=`. Real AR classes do; this shim doesn't keep AR-style
+      # cached metadata keyed on table_name, so we just rewrite @join_table -- the
+      # only state our `table_name` reads.
+      def table_name=(new_table_name)
+        @join_table = new_table_name
+      end
+
+      # Mirror the AR class API for `model.columns_hash` so the migrator's
+      # change_column_back / add_column_back paths work uniformly across real AR
+      # models and HABTM shims. Backed by `connection.columns(table_name)` rather
+      # than AR's class-level cache because the shim has no class-level cache.
+      def columns_hash
+        connection.columns(table_name).index_by(&:name)
+      end
+
       def field_specs
         foreign_keys.each_with_index.each_with_object({}) do |(foreign_key, i), result|
-          result[foreign_key] = parent_models[i]._foreign_key_field_spec(self, foreign_key, position: i, null: false)
+          parent_model = parent_models[i]
+          result[foreign_key] =
+            if parent_model.respond_to?(:_foreign_key_field_spec)
+              # declare_schema model: mirror the parent's primary key (type, limit, etc.)
+              parent_model._foreign_key_field_spec(self, foreign_key, position: i, null: false)
+            else
+              # Non-declare_schema parent: fall back to the configured default PK type.
+              ::DeclareSchema::Model::FieldSpec.new(self, foreign_key, ::DeclareSchema.default_generated_primary_key_type, position: i, null: false)
+            end
         end
       end
 
+      # The HABTM join table's primary key is the composite of its two foreign keys.
+      # (Rails 7.1+ supports composite PKs natively; on 7.0 nothing in AR introspects this
+      # shim, so returning an Array is safe for our callers.)
       def primary_key
-        # TODO: ActiveRecord now supports composite primary keys, so we could return that here.
-        false # no single-column primary key in database
+        foreign_keys
       end
 
       def _declared_primary_key

data/lib/declare_schema/model.rb

@@ -227,19 +227,80 @@ module DeclareSchema
       end
 
       # Returns a FieldSpec for the foreign key column of a belongs_to association.
-      # If the association is polymorphic, the foreign key column is a bigint, or possibly a 4-byte integer
-      # if the foreign key column is already defined that way in the database.
-      # If the association is not polymorphic, the foreign key column matches the primary key type of the associated model.
+      # - For a polymorphic association, the FK uses `DeclareSchema.default_generated_primary_key_type`
+      #   (mirroring `config.generators.primary_key_type`, default :bigint), or :integer with the
+      #   existing column's limit if the column already exists in the database.
+      # - For a non-polymorphic association, the FK should mirror the primary key it points
+      #   at (same data type, same options like limit:, charset:, etc.). However we cannot
+      #   load the parent model right now (at `belongs_to` time) without risking dependency
+      #   cycles between models, so we install a `resolver:` callback. The migration
+      #   generator calls that resolver at generation time -- after all models are
+      #   eager-loaded -- and the resolver returns a fully-mirrored FieldSpec that the
+      #   generator swaps in for this default_spec.
       def _infer_foreign_key_field_spec(foreign_key_column_name, reflection, column_options)
         if reflection.options[:polymorphic]
           if (foreign_key_column = _column(foreign_key_column_name)) && foreign_key_column.type == :integer
             # grandfather foreign key column to match what's in the database
             column_options = column_options.merge(limit: foreign_key_column.limit)
           end
-          FieldSpec.new(self, foreign_key_column_name, :bigint, position: field_specs.size, **column_options)
+          FieldSpec.new(self, foreign_key_column_name, DeclareSchema.default_generated_primary_key_type, position: field_specs.size, **column_options)
         else
-          klass = reflection.klass or raise "Couldn't find belongs_to klass for #{name} in #{reflection.inspect}"
-          klass._foreign_key_field_spec(self, foreign_key_column_name, position: field_specs.size, **column_options)
+          # Capture only what we need from `reflection` (no `reflection.klass` here -- that
+          # would force the parent model to load, which is exactly the cycle we are avoiding).
+          # `reflection.klass` is resolved lazily inside the block below.
+          resolver = ->(default_spec) do
+            _resolve_belongs_to_foreign_key_field_spec(reflection, default_spec)
+          end
+          FieldSpec.new(self, foreign_key_column_name, DeclareSchema.default_generated_primary_key_type,
+                        position: field_specs.size, resolver:, **column_options)
+        end
+      end
+
+      # Called at migration generation time to mirror the parent model's primary key.
+      # Always returns a FieldSpec: the default_spec unchanged when the parent class is not
+      # a declare_schema model (we can't ask for its PK spec, so the configured default PK
+      # type is the best we can offer without inspecting the DB), otherwise a fully mirrored
+      # FieldSpec.
+      #
+      # Reconciliation with the live DB: if the parent's PK column already exists in the
+      # database with the same Rails type but a different :limit (e.g. a legacy table where
+      # `id` is INT(4) but the model now declares the default :bigint), prefer the live
+      # column's :limit so the FK matches what's actually on disk. This preserves the
+      # behavior of the old DB-column lookup (formerly `fk_field_options`) without
+      # overriding intentional type changes.
+      def _resolve_belongs_to_foreign_key_field_spec(reflection, default_spec)
+        klass = reflection.klass or
+          raise "Couldn't find belongs_to klass for #{reflection.name} on #{name} in #{reflection.inspect}"
+
+        if klass.respond_to?(:_primary_key_field_spec)
+          _mirror_parent_primary_key(klass, default_spec)
+        else
+          default_spec
+        end
+      end
+
+      # Build a FieldSpec for the FK by mirroring the parent's declared primary key,
+      # then reconciling against the live DB column when it differs only in :limit
+      # (see _resolve_belongs_to_foreign_key_field_spec for the full rationale).
+      def _mirror_parent_primary_key(klass, default_spec)
+        spec = klass._primary_key_field_spec.foreign_key_field_spec(
+          default_spec.model, default_spec.name,
+          position: default_spec.position, null: default_spec.null
+        )
+
+        # Look up the parent's live PK column directly (not via _column, whose
+        # @table_exists memoization can pin to a stale value when the parent table
+        # is created after the model class is first defined). The rescue covers
+        # the table-doesn't-exist-yet case (greenfield migration).
+        live_pk_column = klass.columns_hash[klass._declared_primary_key.to_s] rescue nil
+        if live_pk_column && live_pk_column.type == spec.type && live_pk_column.limit && live_pk_column.limit != spec.limit
+          FieldSpec.new(
+            spec.model, spec.name, spec.type,
+            position: spec.position,
+            **spec.options.merge(limit: live_pk_column.limit)
+          )
+        else
+          spec
         end
       end
 
@@ -269,14 +330,29 @@ module DeclareSchema
       end
 
       def _primary_key_field_spec_from_table_options(declared_primary_key)
-        primary_key_options = _table_options[declared_primary_key.to_sym] || _table_options[declared_primary_key]
-        options = primary_key_options.is_a?(Hash) ? primary_key_options.dup : {}
-        type = options.delete(:type) || Rails.application.config.generators.options.dig(:active_record, :primary_key_type) || :bigint
+        # _table_options is nil on STI subclasses that never call `declare_schema` themselves:
+        # they inherit `field_specs` etc. via `inheriting_cattr_reader`, but `@_table_options`
+        # is a plain class-instance variable on each class, so the subclass's reader returns
+        # nil. Treat that the same as an empty options hash and fall through to
+        # `default_generated_primary_key_type` below.
+        type, options = _parse_pk_table_options(_table_options&.[](declared_primary_key.to_sym))
+        type ||= DeclareSchema.default_generated_primary_key_type
         FieldSpec.new(self, declared_primary_key, type, **options)
       end
 
       private
 
+      # `declare_schema id: ...` accepts either a Hash (`id: { type: :integer, limit: 4 }`)
+      # or a bare type Symbol (`id: :integer`). Returns [type, options_hash], with type == nil
+      # when value is neither (caller falls back to a default).
+      def _parse_pk_table_options(value)
+        case value
+        when Hash   then [value[:type], value.except(:type)]
+        when Symbol then [value, {}]
+        else             [nil, {}]
+        end
+      end
+
       # if this is a derived class, returns the base class's _declared_primary_key
       # otherwise, returns 'id'
       def _default_declared_primary_key

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "3.1.0.colin.1"
+  VERSION = "3.1.0.colin.2"
 end

data/lib/declare_schema.rb

@@ -65,7 +65,7 @@ module DeclareSchema
       if mysql_version && mysql_version >= SEMVER_8 && charset == 'utf8'
         'utf8mb3'
       else
-        charset.downcase
+        charset
       end
     end
 
@@ -74,7 +74,7 @@ module DeclareSchema
         collation.sub(/\Autf8_/, 'utf8mb3_')
       else
         collation
-      end.downcase
+      end
     end
 
     def default_charset=(charset)
@@ -162,11 +162,16 @@ module DeclareSchema
     end
 
     def current_adapter(model_class = ActiveRecord::Base)
-      if Rails::VERSION::MAJOR >= 6.1
-        model_class.connection_db_config.adapter
-      else
-        model_class.connection_config[:adapter]
-      end
+      model_class.connection_db_config.adapter
+    end
+
+    # Default primary key type for generated foreign keys when we have no parent
+    # model to mirror (e.g. polymorphic FKs, non-declare_schema parents). Mirrors
+    # `config.generators.primary_key_type` so apps that override the Rails default
+    # get consistent behavior. Memoized — Rails config is set at boot.
+    def default_generated_primary_key_type
+      @default_generated_primary_key_type ||=
+        Rails.application.config.generators.options.dig(:active_record, :primary_key_type) || :bigint
     end
   end
 end

data/lib/generators/declare_schema/migration/migrator.rb

@@ -187,11 +187,7 @@ module Generators
           models, db_tables = models_and_tables
           models_by_table_name = {}
           models.each do |m|
-            m.try(:field_specs)&.each do |_name, field_spec|
-              if (pre_migration = field_spec.options.delete(:pre_migration))
-                pre_migration.call(field_spec)
-              end
-            end
+            m.try(:field_specs)&.transform_values!(&:resolve)
 
             if !models_by_table_name.has_key?(m.table_name)
               models_by_table_name[m.table_name] = m
@@ -379,9 +375,14 @@ module Generators
           adds = to_add.map do |col_name_to_add|
             type, options =
               if (spec = model.field_specs[col_name_to_add])
-                [spec.type, spec.sql_options.merge(fk_field_options(model, col_name_to_add)).compact]
+                [spec.type, spec.sql_options.compact]
               else
-                [:integer, {}]
+                # No FieldSpec for this column: it's the declared PK appended at line 366
+                # because it isn't in the DB yet. Use the configured default PK type so
+                # apps that override config.generators.primary_key_type get consistent
+                # behavior; the actual PRIMARY KEY designation is added separately by
+                # PrimaryKeyChange.
+                [::DeclareSchema.default_generated_primary_key_type, {}]
               end
             ::DeclareSchema::SchemaChange::ColumnAdd.new(new_table_name, col_name_to_add, type, **options)
           end
@@ -400,13 +401,12 @@ module Generators
             spec_attrs         = spec.schema_attributes(column)
             column_declaration = ::DeclareSchema::Model::Column.new(model, current_table_name, column)
             col_attrs          = column_declaration.schema_attributes
-            normalized_schema_attrs = spec_attrs.merge(fk_field_options(model, col_name_to_change))
 
-            if !::DeclareSchema::Model::Column.equivalent_schema_attributes?(normalized_schema_attrs, col_attrs)
-              type = normalized_schema_attrs.delete(:type) or raise "no :type found in #{normalized_schema_attrs.inspect}"
+            if !::DeclareSchema::Model::Column.equivalent_schema_attributes?(spec_attrs, col_attrs)
+              type = spec_attrs.delete(:type) or raise "no :type found in #{spec_attrs.inspect}"
               old_type, old_options = change_column_back(model, current_table_name, orig_col_name)
               changes << ::DeclareSchema::SchemaChange::ColumnChange.new(new_table_name, col_name_to_change,
-                                                                         new_type: type, new_options: normalized_schema_attrs,
+                                                                         new_type: type, new_options: spec_attrs,
                                                                          old_type: old_type, old_options: old_options)
             end
           end
@@ -544,25 +544,6 @@ module Generators
           end
         end
 
-        # TODO: switch this to depend on _infer_foreign_key_field_spec instead
-        def fk_field_options(model, field_name)
-          # check if the field_name is a foreign key
-          if (foreign_key = model.constraint_definitions.find { field_name == _1.foreign_key_column })
-            # if so, look up the target table's primary key column to get its limit (note: this is looking in the DB, not the spec)
-            parent_columns = connection.columns(foreign_key.parent_table_name) rescue []
-            pk_limit =
-              if (pk_column = parent_columns.find { _1.name.to_s == "id" }) # right now foreign keys assume id is the target
-                pk_column.limit
-              else
-                8
-              end
-
-            { limit: pk_limit }
-          else
-            {}
-          end
-        end
-
         def change_table_options(model, current_table_name)
           old_options_definition = ::DeclareSchema::Model::TableOptionsDefinition.for_model(model, current_table_name)
           new_options_definition = ::DeclareSchema::Model::TableOptionsDefinition.new(model.table_name, **table_options_for_model(model))

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -25,6 +25,38 @@ RSpec.describe DeclareSchema::Model::FieldSpec do
     end
   end
 
+  describe '#resolve' do
+    let(:default_spec) { described_class.new(model, :advertiser_id, :integer, limit: 8, null: false, position: 1) }
+    let(:mirrored_spec) { described_class.new(model, :advertiser_id, :string, limit: 36, null: false, position: 1) }
+
+    context 'when no resolver was supplied' do
+      it 'returns self' do
+        expect(default_spec.resolve).to equal(default_spec)
+      end
+    end
+
+    context 'when a resolver was supplied' do
+      it 'invokes the resolver with self and returns its result' do
+        captured = nil
+        spec_under_test = described_class.new(model, :advertiser_id, :integer, limit: 8, null: false, position: 1,
+                                              resolver: ->(spec) { captured = spec; mirrored_spec })
+
+        expect(spec_under_test.resolve).to equal(mirrored_spec)
+        expect(captured).to equal(spec_under_test)
+      end
+
+      it 'memoizes the resolver result' do
+        call_count = 0
+        spec_under_test = described_class.new(model, :advertiser_id, :integer, limit: 8, null: false, position: 1,
+                                              resolver: ->(_spec) { call_count += 1; mirrored_spec })
+
+        3.times { spec_under_test.resolve }
+
+        expect(call_count).to eq(1)
+      end
+    end
+  end
+
   describe '#schema_attributes' do
     describe 'integer 4' do
       subject { described_class.new(model, :price, :integer, limit: 4, null: false, position: 0) }

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -988,6 +988,140 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       nuke_model_class(Creative)
     end
 
+    context 'foreign keys mirror non-default primary key types' do
+      after do
+        nuke_model_class(SpecialOrder)       if defined?(SpecialOrder)
+        nuke_model_class(Order)              if defined?(Order)
+        nuke_model_class(LineItem)           if defined?(LineItem)
+        nuke_model_class(Tag)                if defined?(Tag)
+        nuke_model_class(Product)            if defined?(Product)
+        nuke_model_class(ProductsTagsClass)  if defined?(ProductsTagsClass)
+      end
+
+      it 'belongs_to defers parent class lookup to migration time (no dependency cycle)' do
+        # LineItem.belongs_to :order is allowed to mention :order before Order is loaded.
+        # If we eagerly resolved reflection.klass at belongs_to time this would raise
+        # NameError: uninitialized constant LineItem::Order.
+        expect do
+          class LineItem < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+            declare_schema { integer :quantity, null: false }
+            belongs_to :order
+          end
+        end.to_not raise_error
+      end
+
+      it 'belongs_to mirrors the parent primary key type and limit (declared via _table_options)' do
+        # Order has a non-default :string primary key; LineItem.belongs_to :order should
+        # produce a :string foreign key with the same limit -- without forcing Order to
+        # load when LineItem is defined.
+        class LineItem < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          declare_schema do
+            integer :quantity, null: false
+          end
+          belongs_to :order
+        end
+
+        class Order < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          self.primary_key = "id"
+          declare_schema id: { type: :string, limit: 36 } do
+            string :customer_email, limit: 250, null: false
+          end
+        end
+
+        up, _ = Generators::DeclareSchema::Migration::Migrator.run
+
+        expect(up).to match(/t\.string\s+:order_id, limit: 36, null: false/)
+      end
+
+      context 'when belongs_to points at an STI subclass' do
+        # An STI subclass inherits field_specs (via inheriting_cattr_reader) and the
+        # `_primary_key_field_spec` class method (mixed into its parent), but it never
+        # calls `declare_schema` on itself, so its own `@_table_options` is nil. When a
+        # belongs_to points at the STI subclass, the migrator's resolver calls
+        # `klass._primary_key_field_spec`, which previously crashed with
+        # `NoMethodError: undefined method '[]' for nil` because
+        # `_primary_key_field_spec_from_table_options` indexed `_table_options` without
+        # a nil guard.
+        before do
+          class Order < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+            declare_schema do
+              string :customer_email, limit: 250, null: false
+            end
+          end
+
+          class SpecialOrder < Order # rubocop:disable Lint/ConstantDefinitionInBlock
+          end
+
+          class LineItem < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+            declare_schema do
+              integer :quantity, null: false
+            end
+            belongs_to :special_order
+          end
+        end
+
+        let(:up) { Generators::DeclareSchema::Migration::Migrator.run.first }
+
+        it 'mirrors the base class primary key without crashing' do
+          expect(up).to match(/t\.integer\s+:special_order_id, limit: 8, null: false/)
+        end
+      end
+
+      context 'when a HABTM join table has a parent PK type that drifts from the live column' do
+        before do
+          conn = ActiveRecord::Base.connection
+          conn.create_table(:products) { |t| t.string :name, limit: 100, null: false }
+          conn.create_table(:tags)     { |t| t.string :label, limit: 50, null: false }
+          conn.create_table(:products_tags, primary_key: [:product_id, :tag_id]) do |t|
+            t.bigint :product_id, null: false
+            t.bigint :tag_id,     null: false
+          end
+          conn.schema_cache.clear!
+
+          class Product < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+            declare_schema do
+              string :name, limit: 100, null: false
+            end
+            has_and_belongs_to_many :tags
+          end
+
+          class Tag < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+            declare_schema id: { type: :string, limit: 36 } do
+              string :label, limit: 50, null: false
+            end
+            has_and_belongs_to_many :products
+          end
+        end
+
+        let(:up) { Generators::DeclareSchema::Migration::Migrator.run.first }
+
+        it 'generates change_column on the join table without crashing' do
+          expect(up).to match(/change_column\s+:products_tags,\s+:tag_id,\s+:string/)
+        end
+      end
+
+      it 'HABTM mirrors both parents primary key types (different non-default types)' do
+        class Product < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          declare_schema id: { type: :string, limit: 36 } do
+            string :name, limit: 100, null: false
+          end
+          has_and_belongs_to_many :tags
+        end
+
+        class Tag < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          declare_schema id: { type: :integer, limit: 4 } do
+            string :label, limit: 50, null: false
+          end
+          has_and_belongs_to_many :products
+        end
+
+        up, _ = Generators::DeclareSchema::Migration::Migrator.run
+
+        expect(up).to match(/t\.string\s+:product_id, limit: 36, null: false/)
+        expect(up).to match(/t\.integer\s+:tag_id, limit: 4, null: false/)
+      end
+    end
+
     context 'models with the same parent foreign key relation' do
       include_context 'skip if' do
         let(:adapter) { 'sqlite3' }

data/spec/lib/declare_schema/model/habtm_model_shim_spec.rb

@@ -41,7 +41,12 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
   end
 
   describe 'instance methods' do
-    subject { described_class.new(join_table, foreign_keys, parent_table_names, connection: connection) }
+    let(:parent_models) { [User, Customer] }
+    let(:parents) { foreign_keys.zip(parent_models) }
+
+    subject do
+      described_class.new(join_table, parents, connection: connection)
+    end
 
     describe '#initialize' do
       it 'stores initialization attributes' do
@@ -88,8 +93,8 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
     end
 
     describe '#primary_key' do
-      it 'returns false because there is no single-column PK for ActiveRecord to use' do
-        expect(subject.primary_key).to eq(false)
+      it 'returns the composite of the two foreign keys (alphabetically sorted)' do
+        expect(subject.primary_key).to eq(["customer_id", "user_id"])
       end
     end
 
@@ -116,14 +121,15 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
       let(:foreign_keys_and_table_names) { [["advertiser_id", "advertisers"], ["campaign_id", "campaigns"]] }
       let(:foreign_keys) { foreign_keys_and_table_names.map(&:first) }
       let(:parent_table_names) { foreign_keys_and_table_names.map(&:last) }
+      let(:parent_models) { [Table1, Table2] }
 
       before do
-        class Table1 < ActiveRecord::Base
-          self.table_name = 'advertiser_campaign'
+        class Table1 < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          self.table_name = 'advertisers'
         end
 
-        class Table2 < ActiveRecord::Base
-          self.table_name = 'tracking_pixel'
+        class Table2 < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+          self.table_name = 'campaigns'
         end
       end
 

data/spec/lib/generators/declare_schema/migration/migrator_default_pk_type_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'generators/declare_schema/support/thor_shell'
+
+# Verifies that when the migrator has to add a declared primary key column
+# that has no corresponding FieldSpec (because it was appended to `to_add`
+# at lib/generators/declare_schema/migration/migrator.rb:366), the column
+# type is derived from `DeclareSchema.default_generated_primary_key_type`
+# rather than a hardcoded `:integer`. This matters for apps that override
+# `config.generators.primary_key_type`.
+RSpec.describe 'DeclareSchema.default_generated_primary_key_type integration with Migrator' do
+  include_context 'prepare test app'
+
+  before do
+    if current_adapter == 'mysql2'
+      ActiveRecord::Base.connection.execute("CREATE TABLE foos (id int PRIMARY KEY, name varchar(250))")
+    else
+      ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY AUTOINCREMENT NOT NULL, name varchar(250))")
+    end
+    ActiveRecord::Base.connection.schema_cache.clear!
+
+    allow_any_instance_of(DeclareSchema::Support::ThorShell)
+      .to receive(:ask).with(/one of the rename choices or press enter to keep/) { 'drop id' }
+  end
+
+  it 'derives the new PK column type from DeclareSchema.default_generated_primary_key_type rather than a hardcoded :integer' do
+    allow(::DeclareSchema).to receive(:default_generated_primary_key_type).and_return(:string)
+
+    class Foo < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+      declare_schema do
+        string :name, limit: 250
+      end
+      self.primary_key = "foo_id"
+    end
+
+    up, _down = Generators::DeclareSchema::Migration::Migrator.run
+
+    expect(up).to include("add_column :foos, :foo_id, :string")
+    expect(up).not_to include("add_column :foos, :foo_id, :integer")
+  end
+
+  it 'falls through to the configured Rails default (:bigint) when the helper is not stubbed' do
+    class Foo < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+      declare_schema do
+        string :name, limit: 250
+      end
+      self.primary_key = "foo_id"
+    end
+
+    up, _down = Generators::DeclareSchema::Migration::Migrator.run
+
+    expect(up).to include("add_column :foos, :foo_id, #{::DeclareSchema.default_generated_primary_key_type.inspect}")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 3.1.0.colin.1
+  version: 3.1.0.colin.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2026-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 description: Declare your Rails/active_record model schemas and have database migrations
   generated for you!
 email: development@invoca.com
@@ -131,6 +131,7 @@ files:
 - spec/lib/declare_schema/schema_change/table_remove_spec.rb
 - spec/lib/declare_schema/schema_change/table_rename_spec.rb
 - spec/lib/declare_schema_spec.rb
+- spec/lib/generators/declare_schema/migration/migrator_default_pk_type_spec.rb
 - spec/lib/generators/declare_schema/migration/migrator_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_spec_helpers.rb