From 4b0b9a95bcda37c43780cbab341191608ad9fea8 Mon Sep 17 00:00:00 2001 From: Hugo Peixoto Date: Sat, 5 Mar 2011 22:34:03 +0000 Subject: [PATCH] Fixes rails bug #6058. Propagates 'where' clauses when subquerying is triggered on the UpdateManager. --- lib/arel/visitors/to_sql.rb | 2 +- test/test_select_manager.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index f76c149..51a6fd1 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -55,7 +55,7 @@ key on UpdateManager using UpdateManager#key= key = o.relation.primary_key end - wheres = [Nodes::In.new(key, [build_subselect(key, o)])] + wheres = o.wheres + [Nodes::In.new(key, [build_subselect(key, o)])] end [ diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb index 2fe43aa..13a719a 100644 --- a/test/test_select_manager.rb +++ b/test/test_select_manager.rb @@ -713,6 +713,20 @@ module Arel } end + it 'copies where clauses when nesting is triggered' do + engine = EngineProxy.new Table.engine + table = Table.new :users + manager = Arel::SelectManager.new engine + manager.where table[:foo].eq 10 + manager.take 42 + manager.from table + stmt = manager.compile_update(table[:id] => 1) + + stmt.to_sql.must_be_like %{ + UPDATE "users" SET "id" = 1 WHERE "users"."foo" = 10 AND "users"."id" IN (SELECT "users"."id" FROM "users" LIMIT 42) + } + end + it 'executes an update statement' do engine = EngineProxy.new Table.engine table = Table.new :users -- 1.7.1