simple_nested_set 0.0.28 → 0.0.29

data/lib/simple_nested_set/nested_set.rb

@@ -53,12 +53,26 @@ module SimpleNestedSet
       end
     end
 
+    # FIXME This needs to be abstracted away into the SqlAbstraction module
     # FIXME we don't always want to call this on after_save, do we? it's only relevant when
     # either the structure or the slug has changed
     def denormalize!
       sql = []
-      sql << denormalize_level_query if node.has_attribute?(:level)
-      sql << denormalize_path_query  if node.has_attribute?(:path)
+
+      case db_adapter
+      when :mysql, :mysql2
+        sql << denormalize_query_mysql(:level) do |table|
+          table[:id].count.to_sql
+        end if node.has_attribute?(:level)
+
+        sql << denormalize_query_mysql(:path) do |table|
+          group_concat(db_adapter, :slug)
+        end if node.has_attribute?(:path)
+      else
+        sql << denormalize_level_query if node.has_attribute?(:level)
+        sql << denormalize_path_query  if node.has_attribute?(:path)
+      end
+
       update_all(sql.join(',')) unless sql.blank?
     end
 
@@ -129,10 +143,11 @@ module SimpleNestedSet
       Rebuild::FromPaths.new.run(self)
     end
 
-    def rebuild_from_parents!(sort_order = nil)
+    def rebuild_from_parents!(sort_order = :id)
       Rebuild::FromParents.new.run(self, sort_order)
     end
 
+    # sqlite3, postgresql
     def denormalize_level_query
       aliaz = arel_table.as(:l)
       query = aliaz.project(aliaz[:id].count).
@@ -142,6 +157,7 @@ module SimpleNestedSet
       "level = (#{query.join(' AND ')})"
     end
 
+    # sqlite3, postgresql
     def denormalize_path_query
       aliaz = arel_table.as(:l)
       query = aliaz.project(group_concat(db_adapter, :slug)).
@@ -151,6 +167,28 @@ module SimpleNestedSet
       "path = (#{query.join(' AND ')})"
     end
 
+    def denormalize_query_mysql(field)
+      synonym = field.to_s.reverse.to_sym
+      aliaz = arel_table.as("table_#{synonym}")
+
+      field_sql = yield aliaz
+
+      query = [
+        aliaz.project("#{field_sql} AS field_#{synonym}", aliaz[:lft], aliaz[:rgt]).to_sql,
+        ' WHERE ',
+        where_clauses.map { |clause| clause.gsub(arel_table.name, aliaz.table_alias.to_s) }.join(' AND ')
+      ].join
+
+      <<-sql
+        #{field} = (
+          SELECT #{aliaz.table_alias.to_s}.field_#{synonym}
+          FROM (#{query}) AS #{aliaz.table_alias.to_s}
+          WHERE #{aliaz[:lft].lt(arel_table[:lft]).to_sql}
+            AND #{aliaz[:rgt].gt(arel_table[:rgt]).to_sql}
+        )
+      sql
+    end
+
     def db_adapter
       node.class.connection.instance_variable_get('@config')[:adapter].to_sym
     end

data/lib/simple_nested_set/patches/arel_table_initialization.rb

@@ -67,8 +67,8 @@ when '1.0.1'
       end
     end
   end
-when '2.0.6'
-  Gem.patching('arel', '2.0.6') do
+when /2\.0\.[5-7]/
+  Gem.patching('arel', Arel::VERSION) do
     Arel::Table.class_eval do
       attr_reader :options # this line is added
 

data/lib/simple_nested_set/rebuild/from_parents.rb

@@ -9,7 +9,7 @@ module SimpleNestedSet
         @num = 0
       end
 
-      def run(nested_set, sort_order = nil)
+      def run(nested_set, sort_order = :id)
         order_columns = ([:parent_id] + Array[sort_order]).uniq.compact
 
         db_adapter = nested_set.first.class.connection.instance_variable_get('@config')[:adapter].to_sym

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 0
-  - 28
-  version: 0.0.28
+  - 29
+  version: 0.0.29
 platform: ruby
 authors: 
 - Sven Fuchs
+- Matthias Viehweger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +01:00
+date: 2011-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +64,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: ruby-debug
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,23 +78,21 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 2
-        version: 0.5.2
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -106,6 +105,54 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 2
+        - 6
+        version: 0.2.6
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :development
+  version_requirements: *id009
 description: simple_nested_set allows to easily handle nested sets in ActiveRecord
 email: svenfuchs@artweb-design.de
 executables: []