aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-10-30 23:20:48 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-10-30 23:20:48 -0700
commit411336b86712df79016c2a4f36fe4e943546a185 (patch)
treed98a23e364f0fa44f1bedb2fb0d09fb45a8011ae /lib
parent8ab89f5200cdab1aa955e3217b5dd4089d50d63e (diff)
parent2680d6485ae79f7232f032e3209a371e17c76191 (diff)
downloadrails-411336b86712df79016c2a4f36fe4e943546a185.tar.gz
rails-411336b86712df79016c2a4f36fe4e943546a185.tar.bz2
rails-411336b86712df79016c2a4f36fe4e943546a185.zip
Merge pull request #90 from JoelJuliano/patch-1
Allow using non-table alias as a rhs relation name, fix for #84 and #59
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/nodes/table_alias.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/nodes/table_alias.rb b/lib/arel/nodes/table_alias.rb
index 6ec17885fb..b32f057117 100644
--- a/lib/arel/nodes/table_alias.rb
+++ b/lib/arel/nodes/table_alias.rb
@@ -10,7 +10,7 @@ module Arel
end
def table_name
- relation.name
+ relation.respond_to?(:name) ? relation.name : name
end
end
end