diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-14 10:49:15 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-14 10:49:15 -0300 |
| commit | 5dcbca25cef8e8f5809913977cfeb4366c8b44d0 (patch) | |
| tree | 975f8e4f7720553d76ae15b43c05cdca8d660d7f /lib | |
| parent | 808b9e90a38c6c19e109da8eb5f2a264fd780d9a (diff) | |
| download | rails-5dcbca25cef8e8f5809913977cfeb4366c8b44d0.tar.gz rails-5dcbca25cef8e8f5809913977cfeb4366c8b44d0.tar.bz2 rails-5dcbca25cef8e8f5809913977cfeb4366c8b44d0.zip | |
Allow joining a StringJoin with another join relation.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arel/engines/sql/relations/operations/join.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb index 7c5e13510a..a3aaaa163b 100644 --- a/lib/arel/engines/sql/relations/operations/join.rb +++ b/lib/arel/engines/sql/relations/operations/join.rb @@ -26,8 +26,8 @@ module Arel end class StringJoin < Join - def joins(_, __ = nil) - relation2 + def joins(environment, formatter = Sql::TableReference.new(environment)) + [relation1.joins(environment), relation2].compact.join(" ") end end end |