aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-09 09:27:29 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-09 09:27:29 -0700
commit3a36df69b7b8913d333b508da0a6b6cdb68bc6f5 (patch)
treeb40229f30536a53bffb6431ec73465bd81f12a88 /lib
parent5c9d75db74572567d66561f6fba6c10350c530ff (diff)
downloadrails-3a36df69b7b8913d333b508da0a6b6cdb68bc6f5.tar.gz
rails-3a36df69b7b8913d333b508da0a6b6cdb68bc6f5.tar.bz2
rails-3a36df69b7b8913d333b508da0a6b6cdb68bc6f5.zip
Table#join will noop when nil is passed
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/table.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index ac832ed2b3..58e0c46959 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -35,6 +35,8 @@ module Arel
end
def join relation, klass = Nodes::InnerJoin
+ return tm unless relation
+
sm = SelectManager.new(@engine)
case relation
when String, Nodes::SqlLiteral