diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-05 20:44:59 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-07 17:13:18 +0900 |
commit | 8c35f929cf362119ece8bab1afe26a36228fe21d (patch) | |
tree | d92e724e97c4a3737b75a9955ea1d22f13bfdea7 /activerecord/lib/active_record | |
parent | 5ff034e8a27a602bd818e2bfdb6da6e794e33830 (diff) | |
download | rails-8c35f929cf362119ece8bab1afe26a36228fe21d.tar.gz rails-8c35f929cf362119ece8bab1afe26a36228fe21d.tar.bz2 rails-8c35f929cf362119ece8bab1afe26a36228fe21d.zip |
stop raising so many exceptions
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index c3b9a0f9b7..22347fcaef 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -642,7 +642,11 @@ module ActiveRecord def proper_table_name(name) # Use the Active Record objects own table_name, or pre/suffix from ActiveRecord::Base if name is a symbol/string - name.table_name rescue "#{ActiveRecord::Base.table_name_prefix}#{name}#{ActiveRecord::Base.table_name_suffix}" + if name.respond_to? :table_name + name.table_name + else + "#{ActiveRecord::Base.table_name_prefix}#{name}#{ActiveRecord::Base.table_name_suffix}" + end end def migrations_paths |