aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-14 19:48:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-14 19:48:33 -0700
commite1155aa922a04e1cce60a660b4b779bfe3d7d7f5 (patch)
tree6171a44551b43f451c4a2e64b3f4179e4b147585 /lib/arel
parent703326cdc2e6ad426c09cfbf7983f893552ac845 (diff)
downloadrails-e1155aa922a04e1cce60a660b4b779bfe3d7d7f5.tar.gz
rails-e1155aa922a04e1cce60a660b4b779bfe3d7d7f5.tar.bz2
rails-e1155aa922a04e1cce60a660b4b779bfe3d7d7f5.zip
update is working on the select manager
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/select_manager.rb9
-rw-r--r--lib/arel/update_manager.rb4
-rw-r--r--lib/arel/visitors/to_sql.rb2
3 files changed, 14 insertions, 1 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 444ca8f716..7379596aba 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -27,6 +27,15 @@ module Arel
end
# FIXME: this method should go away
+ def update values
+ um = UpdateManager.new @engine
+ um.table values.first.first.relation
+ um.set values
+ um.wheres = @ctx.wheres
+ @engine.connection.execute um.to_sql
+ end
+
+ # FIXME: this method should go away
def insert values
im = InsertManager.new @engine
im.insert values
diff --git a/lib/arel/update_manager.rb b/lib/arel/update_manager.rb
index cc2f973842..f712103f98 100644
--- a/lib/arel/update_manager.rb
+++ b/lib/arel/update_manager.rb
@@ -12,6 +12,10 @@ module Arel
self
end
+ def wheres= exprs
+ @head.wheres = exprs
+ end
+
def where expr
@head.wheres << expr
self
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 4c2a6a10e4..5536ba0267 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -16,7 +16,7 @@ module Arel
[
"UPDATE #{visit o.relation}",
("SET #{o.values.map { |column,value|
- "#{quote_column_name(column.name)} = #{quote visit value}"
+ "#{quote_column_name(column.name)} = #{value ? quote(visit(value)) : 'NULL'}"
}.join ', '}" unless o.values.empty?),
("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?)
].compact.join ' '