Skip to content

A
annotate
Commit d84c5265 by Hrvoje Šimić Committed by Andrew W. Lee
Options

Fix foreign key issue with Rails 6 and Sqlite3 (#695)

Rails 6 has dropped name from ActiveRecord::ConnectionAdapters::ForeignKeyDefinition for Sqlite3 adapter: https://github.com/rails/rails/blob/f2df77709f7e536aaf4d6f984ff21a49d44d34c1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb\#L305-L311 This has caused issues with getting foreign key info and blowing up when trying to annotate models with foreign keys. This commit adds one additional check for name presence and uses column attribute from options instead. Closes #620.
parent 5da79649
Showing with 4 additions and 1 deletion
lib/annotate/annotate_models.rb
...@@ -472,7 +472,10 @@ module AnnotateModels ...@@ -472,7 +472,10 @@ module AnnotateModels
foreign_keys = klass.connection.foreign_keys(klass.table_name) foreign_keys = klass.connection.foreign_keys(klass.table_name)
return '' if foreign_keys.empty? return '' if foreign_keys.empty?
format_name = ->(fk) { options[:show_complete_foreign_keys] ? fk.name : fk.name.gsub(/(?<=^fk_rails_)[0-9a-f]{10}$/, '...') } format_name = lambda do |fk|
return fk.options[:column] if fk.name.blank?
options[:show_complete_foreign_keys] ? fk.name : fk.name.gsub(/(?<=^fk_rails_)[0-9a-f]{10}$/, '...')
end
max_size = foreign_keys.map(&format_name).map(&:size).max + 1 max_size = foreign_keys.map(&format_name).map(&:size).max + 1
foreign_keys.sort_by {|fk| [format_name.call(fk), fk.column]}.each do |fk| foreign_keys.sort_by {|fk| [format_name.call(fk), fk.column]}.each do |fk|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment