diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-07 08:36:09 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-07 08:36:09 -0800 |
| commit | 2fc53bec29bb660e501cf350ae07506082dcb110 (patch) | |
| tree | 7cd8a27a81372589cf9c3c65c6f6e4904a521599 /lib/arel/visitors/to_sql.rb | |
| parent | e7cdaedb6bc7d452142b9b8c42942d659efcd11a (diff) | |
| parent | a85530820426f8baa4dbb1fa863313c6a6c69484 (diff) | |
| download | rails-2fc53bec29bb660e501cf350ae07506082dcb110.tar.gz rails-2fc53bec29bb660e501cf350ae07506082dcb110.tar.bz2 rails-2fc53bec29bb660e501cf350ae07506082dcb110.zip | |
Merge branch 'master' of github.com:rails/arel
* 'master' of github.com:rails/arel:
Add an #table_name method to Table and TableAlias, which always returns the actual table name, not the alias. Then fix ToSql#column_for to use this table name when checking whether the table exists (rather than before, where it was checking whether a table with the alias name exists, which was incorrect).
Diffstat (limited to 'lib/arel/visitors/to_sql.rb')
| -rw-r--r-- | lib/arel/visitors/to_sql.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 7eaaff8e13..f30557e509 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -88,7 +88,7 @@ key on UpdateManager using UpdateManager#key= def column_for attr name = attr.name.to_s - table = attr.relation.name + table = attr.relation.table_name return nil unless table_exists? table |