Stringify the destination primary key too.

Author: carldr

lib/annotate/annotate_models.rb

@@ -347,8 +347,8 @@ def hide_default?(col_type, options)
 
     #  The fk columns might be composite keys, so format them into
     #  a string for the annotation
-    def stringify_fk_columns( columns )
-      columns.class == Array ? columns.join( ", " ) : columns
+    def stringify_columns( columns )
+      columns.class == Array ? "[#{columns.join( ", " )}]" : columns
     end
 
     def get_foreign_key_info(klass, options = {})
@@ -372,9 +372,9 @@ def get_foreign_key_info(klass, options = {})
       max_size = foreign_keys.map(&format_name).map(&:size).max + 1
 
       foreign_keys.sort_by { |fk|
-        [format_name.call(fk), stringify_fk_columns( fk.column ) ]
+        [format_name.call(fk), stringify_columns( fk.column ) ]
       }.each do |fk|
-        ref_info = "#{stringify_fk_columns( fk.column )} => #{fk.to_table}.#{fk.primary_key}"
+        ref_info = "#{stringify_columns( fk.column )} => #{fk.to_table}.#{stringify_columns(fk.primary_key)}"
         constraints_info = ''
         constraints_info += "ON DELETE => #{fk.on_delete} " if fk.on_delete
         constraints_info += "ON UPDATE => #{fk.on_update} " if fk.on_update