simple_nested_set 0.0.7 → 0.0.8

data/lib/simple_nested_set.rb

@@ -8,6 +8,7 @@ module SimpleNestedSet
   autoload :ClassMethods,    'simple_nested_set/class_methods'
   autoload :InstanceMethods, 'simple_nested_set/instance_methods'
   autoload :NestedSet,       'simple_nested_set/nested_set'
+  autoload :SqlAbstraction,  'simple_nested_set/sql_abstraction.rb'
 
   module Move
     autoload :ByAttributes,  'simple_nested_set/move/by_attributes'
@@ -18,4 +19,4 @@ module SimpleNestedSet
   end
 end
 
-ActiveRecord::Base.send :extend, SimpleNestedSet::ActMacro
+ActiveRecord::Base.send :extend, SimpleNestedSet::ActMacro

data/lib/simple_nested_set/nested_set.rb

@@ -1,5 +1,7 @@
 module SimpleNestedSet
   class NestedSet < ActiveRecord::Relation
+    include SqlAbstraction
+
     class_inheritable_accessor :node_class, :scope_names
 
     class << self
@@ -36,7 +38,7 @@ module SimpleNestedSet
       denormalize!
     end
 
-    # FIXME we don't always want to call this on after_save, do we? it's only relevant when 
+    # 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 = []
@@ -106,11 +108,15 @@ module SimpleNestedSet
 
     def denormalize_path_query
       query = arel_table.as(:l)
-      query = query.project("GROUP_CONCAT(slug, '/')").
+      query = query.project(group_concat(db_adapter, :slug)).
               where(query[:lft].lteq(arel_table[:lft])).
               where(query[:rgt].gteq(arel_table[:rgt])).
               where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
       "path = (#{query.to_sql})"
     end
+
+    def db_adapter
+      node.class.connection.instance_variable_get('@config')[:adapter].to_sym
+    end
   end
-end
+end

data/lib/simple_nested_set/sql_abstraction.rb

@@ -0,0 +1,18 @@
+module SimpleNestedSet
+  module SqlAbstraction
+    # return a database-specific 'GROUP_CONCAT'-statement, ready to be
+    # inserted into arel.project()
+    def group_concat(database, field, separator = '/')
+      case database.to_sym
+      when :sqlite, :sqlite3
+        "GROUP_CONCAT(#{field}, '#{separator}')"
+      when :mysql
+        "GROUP_CONCAT(`#{field}`, '#{separator}')"
+      when :postgresql
+        "array_to_string(array_agg(\"#{field}\"), '#{separator}')"
+      else
+        raise ArgumentError, "#{database} is not supported by SimpleNestedSet::SqlAbstraction#group_concat"
+      end
+    end
+  end
+end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -109,6 +109,7 @@ files:
 - lib/simple_nested_set/move/protection.rb
 - lib/simple_nested_set/move/to_target.rb
 - lib/simple_nested_set/nested_set.rb
+- lib/simple_nested_set/sql_abstraction.rb
 - lib/simple_nested_set/version.rb
 has_rdoc: true
 homepage: http://github.com/svenfuchs/simple_nested_set