diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-01-13 17:43:00 -0800 |
|---|---|---|
| committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-01-13 17:43:00 -0800 |
| commit | 2e63ac91302e2df397a286fdaf9cea51635071a6 (patch) | |
| tree | 5d8eb92b25c45ddbf9bb35655da34bdaecf44f1f /lib/active_relation/primitives | |
| parent | 59cc0e235285feeeb652ebc17a128c769e2c9d8c (diff) | |
| download | rails-2e63ac91302e2df397a286fdaf9cea51635071a6.tar.gz rails-2e63ac91302e2df397a286fdaf9cea51635071a6.tar.bz2 rails-2e63ac91302e2df397a286fdaf9cea51635071a6.zip | |
removed support for scalar select (will return later); added support for aliased tables
Diffstat (limited to 'lib/active_relation/primitives')
| -rw-r--r-- | lib/active_relation/primitives/attribute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/active_relation/primitives/attribute.rb b/lib/active_relation/primitives/attribute.rb index b13f9befe1..5ce3dfd531 100644 --- a/lib/active_relation/primitives/attribute.rb +++ b/lib/active_relation/primitives/attribute.rb @@ -14,7 +14,7 @@ module ActiveRelation end def qualified_name - "#{relation.table}.#{name}" + "#{relation.name}.#{name}" end def qualify @@ -78,7 +78,7 @@ module ActiveRelation include Aggregations def to_sql(options = {}) - "#{quote_table_name(relation.table)}.#{quote_column_name(name)}" + (options[:use_alias] && self.alias ? " AS #{self.alias.to_s.to_sql}" : "") + "#{quote_table_name(relation.name)}.#{quote_column_name(name)}" + (options[:use_alias] && self.alias ? " AS #{self.alias.to_s.to_sql}" : "") end end end |