diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:34:43 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:34:43 -0700 |
commit | b10fb7e7bcb5efea6c93ae52bad125887cfc235c (patch) | |
tree | bda34b186b63ac607e7387df935e4d67f3b5123b /activerecord/lib/active_record/associations/association_proxy.rb | |
parent | 164a94d0bc8c9124ab820506e5ad79496395c026 (diff) | |
parent | de0ea3866370ec61581f910cf393a3cc97eba32f (diff) | |
download | rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.tar.gz rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.tar.bz2 rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 676c4ace61..241b9bfee0 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -169,8 +169,8 @@ module ActiveRecord end # Forwards the call to the reflection class. - def sanitize_sql(sql) - @reflection.klass.send(:sanitize_sql, sql) + def sanitize_sql(sql, table_name = @reflection.klass.quoted_table_name) + @reflection.klass.send(:sanitize_sql, sql, table_name) end # Assigns the ID of the owner to the corresponding foreign key in +record+. |