summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-10 09:44:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-10 09:44:39 +0000
commit575f4032a221c8fc7919c2997c13e1424da8006e (patch)
tree36c336301429ef1eadd6d47e6031932b8a1a1a00 /lib
parent10b3e3e32394216fd8700635e71fd25ea52dfda1 (diff)
downloadredmine-575f4032a221c8fc7919c2997c13e1424da8006e.tar.gz
redmine-575f4032a221c8fc7919c2997c13e1424da8006e.zip
Reverted r16053 (#23318).
SQL error with PostgreSQL. git-svn-id: http://svn.redmine.org/redmine/trunk@16054 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/nested_set/issue_nested_set.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/nested_set/issue_nested_set.rb b/lib/redmine/nested_set/issue_nested_set.rb
index 3d1293dc2..afbe6b995 100644
--- a/lib/redmine/nested_set/issue_nested_set.rb
+++ b/lib/redmine/nested_set/issue_nested_set.rb
@@ -158,8 +158,7 @@ module Redmine
self.class.reorder(:id).where(:root_id => sets_to_lock).lock(lock).ids
else
sets_to_lock = [id, parent_id].compact
- inner_join_statement = self.class.select(:root_id).where(id: sets_to_lock).distinct(:root_id).to_sql
- self.class.reorder(:id).joins("INNER JOIN (#{inner_join_statement}) as i2 ON #{self.class.table_name}.root_id = i2.root_id").lock.ids
+ self.class.reorder(:id).where("root_id IN (SELECT root_id FROM #{self.class.table_name} WHERE id IN (?))", sets_to_lock).lock.ids
end
end