aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-14 19:14:49 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-14 19:14:49 -0700
commit703326cdc2e6ad426c09cfbf7983f893552ac845 (patch)
tree8c8ffa45a2aa51ecc3da4dff175e5c0c5f6bce4e /lib
parent6f2230652da18bdc60de2dcbf75f29e7376b918b (diff)
downloadrails-703326cdc2e6ad426c09cfbf7983f893552ac845.tar.gz
rails-703326cdc2e6ad426c09cfbf7983f893552ac845.tar.bz2
rails-703326cdc2e6ad426c09cfbf7983f893552ac845.zip
defaulting values to a list
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/nodes/update_statement.rb2
-rw-r--r--lib/arel/visitors/to_sql.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/arel/nodes/update_statement.rb b/lib/arel/nodes/update_statement.rb
index 3df54bb3a9..9f069cddb3 100644
--- a/lib/arel/nodes/update_statement.rb
+++ b/lib/arel/nodes/update_statement.rb
@@ -6,7 +6,7 @@ module Arel
def initialize
@relation = nil
@wheres = []
- @values = nil
+ @values = []
end
end
end
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 9a9dd20d52..4c2a6a10e4 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -17,7 +17,7 @@ module Arel
"UPDATE #{visit o.relation}",
("SET #{o.values.map { |column,value|
"#{quote_column_name(column.name)} = #{quote visit value}"
- }.join ', '}" if o.values),
+ }.join ', '}" unless o.values.empty?),
("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?)
].compact.join ' '
end