Don't assume the foreign key will be ${FOO}_id

thoughtbot · Feb 13, 2020 · 6a215bc · 6a215bc
1 parent 7847fde
commit 6a215bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/administrate/order.rb b/lib/administrate/order.rb
@@ -62,7 +62,7 @@ def order_by_count(relation)
     end
 
     def order_by_id(relation)
-      relation.reorder("#{attribute}_id #{direction}")
+      relation.reorder("#{foreign_key(relation)} #{direction}")
     end
 
     def has_many_attribute?(relation)
@@ -76,5 +76,9 @@ def belongs_to_attribute?(relation)
     def reflect_association(relation)
       relation.klass.reflect_on_association(attribute.to_s)
     end
+
+    def foreign_key(relation)
+      reflect_association(relation).foreign_key
+    end
   end
 end
diff --git a/spec/lib/administrate/order_spec.rb b/spec/lib/administrate/order_spec.rb
@@ -73,7 +73,10 @@
     context "when relation has belongs_to association" do
       it "orders by id" do
         order = Administrate::Order.new(:name)
-        relation = relation_with_association(:belongs_to, foreign_key: "some_foreign_key")
+        relation = relation_with_association(
+          :belongs_to,
+          foreign_key: "some_foreign_key",
+        )
         allow(relation).to receive(:reorder).and_return(relation)
 
         ordered = order.apply(relation)