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 ' '