declare_schema 3.1.0.colin.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ddb4bb46a974562b49103da5ead57c6ece3d2e7ef76acee4e5b8415df3da761
-  data.tar.gz: 652addeb7c6a6a3c4e1e81dbcdf91250d7c5e8884a1f9084e5dcad61b13abab6
+  metadata.gz: 929f250672103aa42777cb918340e5281d100fdaf19cedb5f7aaa96504e66a8c
+  data.tar.gz: 377a3f2aaae4fa4b6294a4c4a9edd672a8626a505be6a07e06b953a28cb78ffc
 SHA512:
-  metadata.gz: ac38c743e5e469e23a0aee102e8dd6222f6f40004d74dfd8f5503b14e93ee9ce1a2c314f4468f4c110d0821a4b6717f97de32492636c9925252db4a49d278931
-  data.tar.gz: c6758a1c6a3f389cb59a0a0e4b5aace6a02f83d91e943eb1fb9d9d8639ab6bd499b383ced560bf9e58f1934a90460d25607c2b25b62cf2cd024cb0067e3681c6
+  metadata.gz: 8d05a979184d7e93041a462b1269b7d71a6a675f37b8914e27728db0f2d28878d0436cc10eba4bd107f1cb57355c1321147659842367e9231ebb32eec5d14b79
+  data.tar.gz: 3c361cb45d57de4c4aac717155b354f34d0c654b4881c29742a9f611cf7ca8efd0c9297e70433dd7b2df4df70751bf3c1d0463824ccc8eb77f5f9a1d836e711d

data/.github/workflows/pipeline.yml

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

data/CHANGELOG.md

@@ -4,9 +4,11 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.1.0] - Unreleased
+## [4.0.0] - 2026-05-05
 ### Added
-- Add HABTM support for arbitrary primary key in the referenced table (rather than just :bigint). 
+- Generalized `belongs_to` foreign keys to always match the primary key they point at, including
+  in HABTM intersection tables. (Previously this was just a special case that matched up
+  :integer vs :bigint.)
 
 ### Removed
 - Drop support for Rails 6.x. Minimum supported Rails is now 7.0.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (3.1.0.colin.3)
+    declare_schema (4.0.0)
       rails (>= 7.0)
 
 GEM

data/lib/declare_schema/model.rb

@@ -371,13 +371,15 @@ module DeclareSchema
 
       # @param klass [Class] any ActiveRecord class
       # @return [ActiveRecord::ConnectionAdapters::Column, nil] the live PK column, or
-      #   nil when the table doesn't exist yet or can't otherwise be inspected. Reads
-      #   via `columns_hash` directly (not `_column`, whose `@table_exists` memoization
-      #   can pin a stale answer) so a parent table being created in this same
-      #   migration run is honored.
+      #   nil when the table doesn't exist yet or can't otherwise be inspected, or
+      #   when the model has a compound primary key (Array PK name misses
+      #   `columns_hash`). Reads via `columns_hash` directly (not `_column`, whose
+      #   `@table_exists` memoization can pin a stale answer) so a parent table
+      #   being created in this same migration run is honored.
       def _pk_column_for(klass)
-        pk_name = klass.respond_to?(:_declared_primary_key) ? klass._declared_primary_key : klass.primary_key
-        klass.columns_hash[pk_name.to_s] if pk_name
+        if (pk_name = klass.try(:_declared_primary_key) || klass.primary_key)
+          klass.columns_hash[pk_name]
+        end
       rescue ActiveRecord::StatementInvalid, ActiveRecord::NoDatabaseError
         nil
       end
@@ -391,13 +393,25 @@ module DeclareSchema
       #   the column type doesn't round-trip cleanly
       def _field_spec_options_from_pk_column(column)
         if column&.type == :integer
-          column.limit == 8 ? [:bigint, {}] : [:integer, { limit: column.limit || 4 }]
+          if column.limit == 8
+            [:bigint, {}]
+          else
+            [:integer, { limit: column.limit || 4 }]
+          end
         end
       end
 
       # `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).
+      # or a bare type Symbol (`id: :integer`). Normalizes both shapes -- plus the
+      # absent / unrecognized case -- into a uniform `[type, options]` pair so the
+      # caller (`_primary_key_field_spec_from_table_options`) can dispatch on
+      # `type.nil?` to decide whether to fall back to live-PK inspection or the
+      # gem default.
+      #
+      # @param value [Hash, Symbol, nil] the per-PK entry from `_table_options`
+      # @return [Array(Symbol, Hash), Array(nil, Hash)] `[type, options]` where
+      #   `type` is nil when `value` is neither a Hash nor a Symbol (signal to
+      #   caller to fall back). `options` always excludes `:type`.
       def _parse_pk_table_options(value)
         case value
         when Hash   then [value[:type], value.except(:type)]

data/lib/declare_schema/version.rb

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

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

@@ -80,7 +80,16 @@ module Generators
           self.class.native_types
         end
 
-        # return habtm reflections keyed by join table name (so that habtm from each side has just one entry)
+        # Collect every HABTM reflection across the application, keyed by its join
+        # table name. Each join table is shared by both sides of a HABTM
+        # association, so iterating all descendants would yield two reflections
+        # per join table (one from each parent model). Keying by `join_table` and
+        # using `||=` keeps the first occurrence and silently drops the duplicate
+        # from the other side, so the migrator emits exactly one shim per join
+        # table.
+        #
+        # @return [Hash{String => ActiveRecord::Reflection::HasAndBelongsToManyReflection}]
+        #   join table name -> the (first-seen) HABTM reflection that owns it
         def habtm_tables
           ActiveRecord::Base.send(:descendants).each_with_object({}) do |c, result|
             c.reflect_on_all_associations(:has_and_belongs_to_many).each do |a|

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

@@ -12,11 +12,11 @@ RSpec.describe 'DeclareSchema.default_generated_primary_key_type integration wit
   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
+    # Cross-adapter DDL: `integer PRIMARY KEY NOT NULL` works on sqlite, mysql, and
+    # postgres. AUTOINCREMENT (sqlite) / AUTO_INCREMENT (mysql) / SERIAL (postgres)
+    # would all be valid, but the migrator inspects type/null, not auto-increment
+    # metadata, so we can skip the auto-increment dance entirely.
+    ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY NOT NULL, name varchar(250))")
     ActiveRecord::Base.connection.schema_cache.clear!
 
     allow_any_instance_of(DeclareSchema::Support::ThorShell)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 3.1.0.colin.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-04 00:00:00.000000000 Z
+date: 2026-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails