forest_admin_datasource_active_record 1.39.3 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddfd12ebb706866609ce4c1458d330cedc17cde4f14e26fd059230659e3cdba5
-  data.tar.gz: 30201eb77c426baa4c4b7cfd61ce0c2128083b242478cb931b88bdeaac16ae6d
+  metadata.gz: 900ccccbc0c8a7ae95c5eee13a67dca16bbad7add14ac849381a95246878393d
+  data.tar.gz: 7fb49021e33e83ed9cb8e01a39a813b4e261fae73e8d6d32e936092f843e7aad
 SHA512:
-  metadata.gz: dd4e8e5be822de14ed9d2b50b1b58442efdfab59da42c5a1311db82a2d4f5747e9d06b6d795b230f25a64277c9378556f8432c04119c9db5d339a06789be5b5c
-  data.tar.gz: 5a5071df3692ad901f84ebe9b5595702b83b6496fb43bcabc40ee3b4a5ccad060d5c123bde4fab1a4f3f3516bd59cd1c8170949c37363ec4095568083f29f735
+  metadata.gz: dcda7837f4a0d0b6658c10ae3245d9e31ab3933d7302b414e7560716f1cf6ccfb261f4ccc1e93dac131384cfb927cca9b5cb412c6ebace19cff563b24398d67b
+  data.tar.gz: 43d723551915aace679d91971d5264f70e91f2adbd4a5bde9bc153884a69364292d5fbb7d33e2584794ca5f7009358ee783cdf930b2521035e5ef12e31b70f63

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -88,6 +88,60 @@ module ForestAdminDatasourceActiveRecord
       %i[destroy destroy_async delete_all].include?(association.options[:dependent])
     end
 
+    # join_foreign_key can fall back to the through model's own PK (see
+    # valid_many_to_many_source? below); that PK usually still exists as a column, so
+    # "column missing" alone doesn't catch every unrepresentable case -- a composite key is
+    # unrepresentable too, even when every individual column exists: GeneratorField looks
+    # fields up by the raw key, so a composite key never resolves. A composite key can reach
+    # us either as a real Array, or (via an explicit primary_key: option on the source)
+    # already flattened by Rails into a mangled String like '["a", "b"]' -- neither is ever a
+    # real column name, so checking column membership catches both forms uniformly, on
+    # whichever collection each key is actually resolved against downstream (#370).
+    def unrepresentable_many_to_many?(association, through_reflection)
+      [
+        [association.join_foreign_key, through_reflection.klass],
+        [through_reflection.foreign_key, through_reflection.klass],
+        [association.association_primary_key, association.klass]
+      ].any? { |key, klass| !klass.column_names.include?(key) }
+    end
+
+    # True only for a belongs_to source: ThroughReflection#join_foreign_key delegates to
+    # the source reflection, and only belongs_to overrides it to return a real FK column.
+    # Any other source macro falls back to AssociationReflection#active_record_primary_key
+    # -- the through model's own primary key column (honoring a custom primary_key:, and
+    # possibly composite), not a genuine join column (#370).
+    def valid_many_to_many_source?(association)
+      association.source_reflection&.belongs_to?
+    end
+
+    def build_many_to_many_field(association, through_reflection, is_polymorphic, source_polymorphic)
+      ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
+        foreign_collection: format_model_name(association.klass.name),
+        origin_key: through_reflection.foreign_key,
+        origin_key_target: through_reflection.join_foreign_key,
+        foreign_key: association.join_foreign_key,
+        foreign_key_target: association.association_primary_key,
+        through_collection: format_model_name(through_reflection.klass.name),
+        origin_type_field: is_polymorphic ? through_reflection.type : nil,
+        origin_type_value: is_polymorphic ? @model.name : nil,
+        foreign_type_field: source_polymorphic ? association.source_reflection.foreign_type : nil,
+        foreign_type_value: source_polymorphic ? association.options[:source_type] : nil
+      )
+    end
+
+    def add_many_to_many_field(association, through_reflection, is_polymorphic, source_polymorphic)
+      if unrepresentable_many_to_many?(association, through_reflection)
+        warn_unrepresentable_many_to_many(association, through_reflection)
+        return
+      end
+
+      add_field(
+        association.name.to_s,
+        build_many_to_many_field(association, through_reflection, is_polymorphic, source_polymorphic)
+      )
+      warn_identity_join(association, through_reflection) unless valid_many_to_many_source?(association)
+    end
+
     # rubocop:disable Metrics/BlockNesting
     def fetch_associations
       associations(@model, support_polymorphic_relations: @support_polymorphic_relations).each do |association|
@@ -99,23 +153,10 @@ module ForestAdminDatasourceActiveRecord
               is_polymorphic = through_reflection.options[:as].present?
               source_polymorphic = association.source_reflection&.polymorphic? &&
                                    association.options[:source_type].present?
+              many_to_many_shape = is_polymorphic || source_polymorphic
 
-              if is_polymorphic || source_polymorphic
-                add_field(
-                  association.name.to_s,
-                  ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
-                    foreign_collection: format_model_name(association.klass.name),
-                    origin_key: through_reflection.foreign_key,
-                    origin_key_target: through_reflection.join_foreign_key,
-                    foreign_key: association.join_foreign_key,
-                    foreign_key_target: association.association_primary_key,
-                    through_collection: format_model_name(through_reflection.klass.name),
-                    origin_type_field: is_polymorphic ? through_reflection.type : nil,
-                    origin_type_value: is_polymorphic ? @model.name : nil,
-                    foreign_type_field: source_polymorphic ? association.source_reflection.foreign_type : nil,
-                    foreign_type_value: source_polymorphic ? association.options[:source_type] : nil
-                  )
-                )
+              if many_to_many_shape
+                add_many_to_many_field(association, through_reflection, is_polymorphic, source_polymorphic)
               else
                 add_field(
                   association.name.to_s,
@@ -186,21 +227,7 @@ module ForestAdminDatasourceActiveRecord
               source_polymorphic = association.source_reflection&.polymorphic? &&
                                    association.options[:source_type].present?
 
-              add_field(
-                association.name.to_s,
-                ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
-                  foreign_collection: format_model_name(association.klass.name),
-                  origin_key: through_reflection.foreign_key,
-                  origin_key_target: through_reflection.join_foreign_key,
-                  foreign_key: association.join_foreign_key,
-                  foreign_key_target: association.association_primary_key,
-                  through_collection: format_model_name(through_reflection.klass.name),
-                  origin_type_field: is_polymorphic ? through_reflection.type : nil,
-                  origin_type_value: is_polymorphic ? @model.name : nil,
-                  foreign_type_field: source_polymorphic ? association.source_reflection.foreign_type : nil,
-                  foreign_type_value: source_polymorphic ? association.options[:source_type] : nil
-                )
-              )
+              add_many_to_many_field(association, through_reflection, is_polymorphic, source_polymorphic)
             elsif association.inverse_of&.polymorphic?
               add_field(
                 association.name.to_s,
@@ -303,6 +330,38 @@ module ForestAdminDatasourceActiveRecord
       klass
     end
 
+    def warn_unrepresentable_many_to_many(association, through_reflection)
+      logger = ActiveSupport::Logger.new($stdout)
+      logger.warn(
+        "[ForestAdmin] ⚠️  Skipping association '#{association.name}' in model '#{@model.name}': " \
+        'this relation cannot be represented as a Forest Admin many-to-many -- its join keys must ' \
+        'each be a single existing column, on the through collection ' \
+        "'#{format_model_name(through_reflection.klass.name)}' or the foreign collection " \
+        "'#{format_model_name(association.klass.name)}' (composite/query_constraints keys are " \
+        'not supported).'
+      )
+    end
+
+    # join_foreign_key/association_primary_key are guaranteed to be single, real, existing
+    # columns here: unrepresentable_many_to_many? above already checks column membership for
+    # both (and for origin_key) before this is ever called.
+    #
+    # Deliberately a diagnostic, not a deprecation notice: this shape is common (any
+    # has_many/has_one :through sourced from a plain has_one/has_many, not just polymorphic
+    # ones) and the relation is kept published to avoid narrowing the schema -- see #370.
+    # No removal is promised or planned.
+    def warn_identity_join(association, through_reflection)
+      logger = ActiveSupport::Logger.new($stdout)
+      logger.warn(
+        "[ForestAdmin] ⚠️  Association '#{association.name}' in model '#{@model.name}' is published " \
+        "as a many-to-many joining '#{format_model_name(through_reflection.klass.name)}'." \
+        "'#{association.join_foreign_key}' to " \
+        "'#{format_model_name(association.klass.name)}'.'#{association.association_primary_key}': " \
+        "its source association is not a belongs_to, so this join uses each side's own identifier " \
+        'rather than a dedicated foreign key column -- see #370 for background.'
+      )
+    end
+
     def warn_missing_polymorphic_columns(association)
       missing_columns = []
       missing_columns << association.foreign_key unless schema[:fields][association.foreign_key]

data/lib/forest_admin_datasource_active_record/parser/column.rb

@@ -17,6 +17,9 @@ module ForestAdminDatasourceActiveRecord
         string: 'String',
         text: 'String',
         citext: 'String',
+        inet: 'String',
+        cidr: 'String',
+        macaddr: 'String',
         time: 'Time',
         uuid: 'Uuid',
         binary: 'Binary'

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.39.3"
+  VERSION = "1.40.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.39.3
+  version: 1.40.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-26 00:00:00.000000000 Z
+date: 2026-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord