diff options
| author | Philip Arndt <parndt@gmail.com> | 2011-11-03 17:21:34 +1300 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2011-11-03 17:21:34 +1300 |
| commit | 7fc81c8ede91b77f8da3c8dcc0380095983ad678 (patch) | |
| tree | 0e4dd32d601153077754ba46f037f0c192cb9098 /lib/arel/nodes/table_alias.rb | |
| parent | 4653755ca28d49ef8215254c4de9da4bb6b888e6 (diff) | |
| parent | 411336b86712df79016c2a4f36fe4e943546a185 (diff) | |
| download | rails-7fc81c8ede91b77f8da3c8dcc0380095983ad678.tar.gz rails-7fc81c8ede91b77f8da3c8dcc0380095983ad678.tar.bz2 rails-7fc81c8ede91b77f8da3c8dcc0380095983ad678.zip | |
Merge remote-tracking branch 'rails/master'
Diffstat (limited to 'lib/arel/nodes/table_alias.rb')
| -rw-r--r-- | lib/arel/nodes/table_alias.rb | 2 |
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 |