diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 20:06:30 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 20:06:30 -0700 |
| commit | 696375ac628bd41edf3a8c8c00dde196696f4add (patch) | |
| tree | 0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1 /activerecord/lib/active_record/associations/association_proxy.rb | |
| parent | 685a53a360d0d8fc4a9f3b49f900621c940a71f2 (diff) | |
| parent | b10fb7e7bcb5efea6c93ae52bad125887cfc235c (diff) | |
| download | rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.gz rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.bz2 rails-696375ac628bd41edf3a8c8c00dde196696f4add.zip | |
Merge branch 'master' into cherry
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+. |