From cdf9cae4a2cfa0504c236cf43ab795d9c0e984ee Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 24 May 2014 10:18:05 +0000 Subject: awesome_nested_set: not use cache for max rgt (#6579) git-svn-id: http://svn.redmine.org/redmine/trunk@13148 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../awesome_nested_set/lib/awesome_nested_set/model.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb index abd1fc013..dbbf569a7 100644 --- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb +++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb @@ -159,19 +159,11 @@ module CollectiveIdea #:nodoc: nested_set_scope.column_names.map(&:to_s).include?(depth_column_name.to_s) end - def right_most_node - @right_most_node ||= self.class.base_class.unscoped.nested_set_scope( - :order => "#{quoted_right_column_full_name} desc" - ).first - end - def right_most_bound - @right_most_bound ||= begin - return 0 if right_most_node.nil? - - right_most_node.lock! - right_most_node[right_column_name] || 0 - end + right_most_node = + self.class.base_class.unscoped. + order("#{quoted_right_column_full_name} desc").limit(1).lock(true).first + right_most_node ? (right_most_node[right_column_name] || 0) : 0 end def set_depth! -- cgit v1.2.3