aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-16 15:40:12 -0700
committerJon Leighton <j@jonathanleighton.com>2011-05-16 15:40:12 -0700
commit2033ff825b6eb33db5e4bb73de04f6e2f7114f93 (patch)
treea46096a2760989953fac9d4ca09fd1d3a3f7cd8c /activerecord/lib
parentbf5e4b4c1f7f44e6f475c6bc7db91879ccd12448 (diff)
parentecbde46e572192596df8cad81515f958070c8902 (diff)
downloadrails-2033ff825b6eb33db5e4bb73de04f6e2f7114f93.tar.gz
rails-2033ff825b6eb33db5e4bb73de04f6e2f7114f93.tar.bz2
rails-2033ff825b6eb33db5e4bb73de04f6e2f7114f93.zip
Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false
Fixing has_many when ActiveRecord::Base.pluralize_table_names is false
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/alias_tracker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/alias_tracker.rb b/activerecord/lib/active_record/associations/alias_tracker.rb
index 634dee2289..44e2ee141e 100644
--- a/activerecord/lib/active_record/associations/alias_tracker.rb
+++ b/activerecord/lib/active_record/associations/alias_tracker.rb
@@ -50,7 +50,7 @@ module ActiveRecord
end
def pluralize(table_name)
- ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
+ ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name.to_s
end
private