aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-07 15:27:08 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-07 15:27:08 -0700
commitd0e6b969d678fe1a7da4a9f0cedc47e66dcc4173 (patch)
tree697e8e017322c444fb2e38da7f889d4d0671b429 /lib/arel
parent5b480bc60bf5de2b90ba32e854b6a7d2955cbcbb (diff)
downloadrails-d0e6b969d678fe1a7da4a9f0cedc47e66dcc4173.tar.gz
rails-d0e6b969d678fe1a7da4a9f0cedc47e66dcc4173.tar.bz2
rails-d0e6b969d678fe1a7da4a9f0cedc47e66dcc4173.zip
nooping on nil parameters
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/select_manager.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index b574253b05..c9214b20a2 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -19,6 +19,8 @@ module Arel
end
def join relation, klass = Nodes::InnerJoin
+ return self unless relation
+
case relation
when String, Nodes::SqlLiteral
raise if relation.blank?