Use concat and reuse existing CompositePrimaryKeyItem model for tests

- Use concat instead of .each { |fk| << fk } in positioning.rb as brendon requested
- Remove CompositeKeyList/CompositeKeyListItem models created from scratch
- Reuse existing CompositePrimaryKeyItem (which has composite PK) as parent
- Create minimal CompositeForeignKeyItem child with composite FK to it

Agent-Logs-Url: https://github.com/brendon/positioning/sessions/fd37d2c2-d391-4065-94bd-c2f48fe26b0a

Co-authored-by: brendon <81871+brendon@users.noreply.github.com>

Author: Copilot

lib/positioning.rb

@@ -35,7 +35,7 @@ def positioned(on: [], column: :position)
             reflection = reflections[scope_component]
 
             if reflection&.belongs_to?
-              Array(reflection.foreign_key).each { |fk| positioning_columns[column][:scope_columns] << fk }
+              positioning_columns[column][:scope_columns].concat Array(reflection.foreign_key)
               positioning_columns[column][:scope_columns] << reflection.foreign_type if reflection.polymorphic?
               positioning_columns[column][:scope_associations] << reflection.name
             else

test/models/composite_foreign_key_item.rb

@@ -0,0 +1,7 @@
+if ActiveRecord.version >= Gem::Version.new("7.2.0")
+  class CompositeForeignKeyItem < ActiveRecord::Base
+    belongs_to :composite_primary_key_item, foreign_key: [:cpki_item_id, :cpki_account_id]
+
+    positioned on: :composite_primary_key_item
+  end
+end

test/models/composite_key_list.rb

@@ -3,5 +3,9 @@ class CompositePrimaryKeyItem < ActiveRecord::Base
 
   belongs_to :list
 
+  if ActiveRecord.version >= Gem::Version.new("7.2.0")
+    has_many :composite_foreign_key_items, foreign_key: [:cpki_item_id, :cpki_account_id], dependent: :destroy
+  end
+
   positioned on: :list
 end

test/models/composite_key_list_item.rb

@@ -56,19 +56,14 @@
     add_index :composite_primary_key_items, [:list_id, :position], unique: true
 
     if ActiveRecord.version >= Gem::Version.new("7.2.0")
-      create_table :composite_key_lists, primary_key: [:shop_id, :id], force: true do |t|
-        t.integer :shop_id, null: false
-        t.string :name
-      end
-
-      create_table :composite_key_list_items, force: true do |t|
+      create_table :composite_foreign_key_items, force: true do |t|
         t.string :name
         t.integer :position, null: false
-        t.integer :shop_id, null: false
-        t.integer :composite_key_list_id, null: false
+        t.integer :cpki_item_id, null: false
+        t.integer :cpki_account_id, null: false
       end
 
-      add_index :composite_key_list_items, [:shop_id, :composite_key_list_id, :position], unique: true, name: "index_ckli_on_scope_and_position"
+      add_index :composite_foreign_key_items, [:cpki_item_id, :cpki_account_id, :position], unique: true, name: "index_cfki_on_scope_and_position"
     end
 
     create_table :categories, force: true do |t|

test/models/composite_primary_key_item.rb

@@ -11,8 +11,7 @@
 require_relative "models/new_item"
 require_relative "models/default_scope_item"
 require_relative "models/composite_primary_key_item"
-require_relative "models/composite_key_list"
-require_relative "models/composite_key_list_item"
+require_relative "models/composite_foreign_key_item"
 require_relative "models/product"
 require_relative "models/category"
 require_relative "models/categorised_item"

test/support/active_record.rb

@@ -570,14 +570,15 @@ def test_destroyed_via_positioning_scope?
   def test_destroyed_via_positioning_scope_with_composite_foreign_key
     skip "Composite foreign keys require Rails 7.2+" if ActiveRecord.version < Gem::Version.new("7.2.0")
 
-    list = CompositeKeyList.create(shop_id: 1, name: "List")
-    item = list.composite_key_list_items.create(name: "Item 1")
-    list.composite_key_list_items.create(name: "Item 2")
+    list = List.create(name: "List")
+    parent = CompositePrimaryKeyItem.create(item_id: 1, account_id: 1, list: list, name: "Parent")
+    child = parent.composite_foreign_key_items.create(name: "Child 1")
+    parent.composite_foreign_key_items.create(name: "Child 2")
 
-    mechanisms = Positioning::Mechanisms.new(item, :position)
+    mechanisms = Positioning::Mechanisms.new(child, :position)
     refute mechanisms.send(:destroyed_via_positioning_scope?)
 
-    list.destroy
+    parent.destroy
     assert mechanisms.send(:destroyed_via_positioning_scope?)
   end
 end