forest_admin_datasource_active_record 1.12.4 → 1.12.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/forest_admin_datasource_active_record/collection.rb +2 -2
  3. data/lib/forest_admin_datasource_active_record/parser/relation.rb +4 -0
  4. data/lib/forest_admin_datasource_active_record/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bbd75c11e880193d29a492dece09a004a9bec4b0c6f7b8599dae2b85887f1c3f
4
- data.tar.gz: 78e5ced8bd5f8f08db2c48a4ddcf02240a665bedbe7b6d904e99a48ee70dcf87
3
+ metadata.gz: 9af21b22a6806ae02c5510d74d495101af49ff65e67fb7ff51e13ddf13bc88cd
4
+ data.tar.gz: 73d0c161a08b10dde88c52b811b3534a0fef3c58574cabdf7f5a43f50266470e
5
5
  SHA512:
6
- metadata.gz: 6b8633adae02bdf70054d616c31e447037a6c005082f2d7d3e7adadc2340d3eca6c9c921d739533721c271d19511de21a3f62b3b3d516524454ba6eb23eb4b2e
7
- data.tar.gz: 9667c11a0f2d7fecbd11f74f4bc734e06a57a9d6e3c491fe12bb39224978a23370f7b1169a7b44726365d8bb2144b209124af8958d30f638f04edf9607582a22
6
+ metadata.gz: 1c6e25bb0dd3e0badd9fed1fa3f57a2b4feb027d4071277ccfefe49a28bb6c91ee652f752e64de237f1ef9f2a033e533bfaa717dcaa8bc2087a8e30a71c73620
7
+ data.tar.gz: 663d6b4bc543c26184bdb37a07be8953d85e702412fff904885e32e80159bf91eaa61c5ac525ce4fb1a8856e32f27c23d5dfe31382a31a0ac8056c6e7d4c36e5
data/lib/forest_admin_datasource_active_record/collection.rb CHANGED
@@ -114,7 +114,7 @@ module ForestAdminDatasourceActiveRecord
114
114
  ForestAdminDatasourceToolkit::Schema::Relations::OneToOneSchema.new(
115
115
  foreign_collection: format_model_name(association.klass.name),
116
116
  origin_key: association.foreign_key,
117
- origin_key_target: association.association_primary_key
117
+ origin_key_target: association_primary_key(association)
118
118
  )
119
119
  )
120
120
  end
@@ -176,7 +176,7 @@ module ForestAdminDatasourceActiveRecord
176
176
  ForestAdminDatasourceToolkit::Schema::Relations::OneToManySchema.new(
177
177
  foreign_collection: format_model_name(association.klass.name),
178
178
  origin_key: association.foreign_key,
179
- origin_key_target: association.association_primary_key
179
+ origin_key_target: association_primary_key(association)
180
180
  )
181
181
  )
182
182
  end
data/lib/forest_admin_datasource_active_record/parser/relation.rb CHANGED
@@ -39,6 +39,10 @@ module ForestAdminDatasourceActiveRecord
39
39
 
40
40
  types
41
41
  end
42
+
43
+ def association_primary_key(association)
44
+ association.options[:primary_key]&.to_s || association.association_primary_key
45
+ end
42
46
  end
43
47
  end
44
48
  end
data/lib/forest_admin_datasource_active_record/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForestAdminDatasourceActiveRecord
2
- VERSION = "1.12.4"
2
+ VERSION = "1.12.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: forest_admin_datasource_active_record
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.12.4
4
+ version: 1.12.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthieu
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2025-10-24 00:00:00.000000000 Z
12
+ date: 2025-10-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord