simple_nested_set 0.0.22 → 0.0.23

data/lib/simple_nested_set/nested_set.rb

@@ -129,14 +129,17 @@ module SimpleNestedSet
       #         where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
       # "level = (#{query.to_sql})"
 
+      scope = where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')
+      scope = "AND #{scope}" unless scope.empty?
+
       %(
         level = (
           SELECT COUNT("l"."id")
           FROM #{table_name} AS l
           WHERE
             l.lft < #{table_name}.lft AND
-            l.rgt > #{table_name}.rgt AND
-            #{where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')}
+            l.rgt > #{table_name}.rgt
+            #{scope}
         )
       )
     end
@@ -149,14 +152,17 @@ module SimpleNestedSet
       #         where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
       # "path = (#{query.to_sql})"
 
+      scope = where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')
+      scope = "AND #{scope}" unless scope.empty?
+
       %(
         path = (
           SELECT #{group_concat(db_adapter, :slug)}
           FROM #{table_name} AS l
           WHERE
             l.lft <= #{table_name}.lft AND
-            l.rgt >= #{table_name}.rgt AND
-            #{where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')}
+            l.rgt >= #{table_name}.rgt
+            #{scope}
         )
       )
     end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +01:00
+date: 2010-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency