Skip to content

Commit c7615d4

Browse files
committed
Merge pull request #347 from brentwalther/fix316
Fix fatal error when using `annotate` with ActiveRecord 4.1
2 parents b319409 + 18eb2d0 commit c7615d4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/annotate/annotate_models.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ def get_foreign_key_info(klass, options={})
321321
fk_info = "#\n# Foreign Keys\n#\n"
322322
end
323323

324-
return '' unless klass.connection.supports_foreign_keys? && klass.connection.respond_to?(:foreign_keys)
324+
return '' unless klass.connection.respond_to?(:supports_foreign_keys?) &&
325+
klass.connection.supports_foreign_keys? && klass.connection.respond_to?(:foreign_keys)
325326

326327
foreign_keys = klass.connection.foreign_keys(klass.table_name)
327328
return '' if foreign_keys.empty?

0 commit comments

Comments
 (0)