activerecord-hierarchical_query 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb06a2b6a2d1c5e9d77bdcae7bcd93fc648a1d0f
-  data.tar.gz: 0a88b8b0bb779d4bab7395b02818574c7b2559dd
+  metadata.gz: 1549f26e6ece270b3daacb073b2a817bfd1af1fa
+  data.tar.gz: 8138b6f92c03fb569464026187be7a8f16d4b52d
 SHA512:
-  metadata.gz: 4ae72dfaa66ce34d6a83967367afcf4d5b74883e77da4bc0b909c82d0a4fab442cd7b237e2dba8f9dc6fe6f3baa5eb2a2fbd3b297bc1481dc1a249f3110385de
-  data.tar.gz: d40b2571939dfb11d7579f62f03da854444bdb6555638db67b9fc735b386b5b900fec7f8aaf054b5566abcf91ab8a35b5a1b38a6616e3eefd03e663917a167b1
+  metadata.gz: 9873c2dd645746f3d42bdcee30e77dd30e5bf0a2df2a3bb7446f978a48614feeb9b713e3c199f6c8c1a3429127f9a2851096d3bb18522faf79bff9e1065d7b62
+  data.tar.gz: 43272bdb02606a2b32f32b5bf282758418727fd911b98bcd0fdb8d7cdb3a4199558c1f4e96a8006511e5d11c2e5f9236dcfba9020b74d57459708e0cd8796b3b

data/lib/active_record/hierarchical_query/cte/non_recursive_term.rb

@@ -29,7 +29,8 @@ module ActiveRecord
           @scope ||= query.
               start_with_value.
               select(columns).
-              except(*DISALLOWED_CLAUSES)
+              except(*DISALLOWED_CLAUSES).
+              reorder(nil)
         end
 
         def columns
@@ -51,4 +52,4 @@ module ActiveRecord
       end # class NonRecursiveTerm
     end
   end
-end
+end

data/lib/active_record/hierarchical_query/cte/recursive_term.rb

@@ -25,7 +25,7 @@ module ActiveRecord
 
         private
         def scope
-          @scope ||= query.child_scope_value.select(columns)
+          @scope ||= query.child_scope_value.select(columns).reorder(nil)
         end
 
         def columns

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/spec/active_record/hierarchical_query_spec.rb

@@ -330,4 +330,22 @@ describe ActiveRecord::HierarchicalQuery do
       expect(result).to include(article)
     end
   end
+
+  describe 'Models with default scope' do
+    let!(:scoped_root) { ModelWithDefaultScope.create!(name: '9. Root') }
+    let!(:scoped_child_1) { ModelWithDefaultScope.create!(name: '8. Child', parent: scoped_root) }
+    let!(:scoped_child_2) { ModelWithDefaultScope.create!(name: '7. Child', parent: scoped_root) }
+
+    subject(:result) {
+      ModelWithDefaultScope.join_recursive do |query|
+        query
+          .connect_by(id: :parent_id)
+          .start_with(id: scoped_root.id)
+      end
+    }
+
+    it 'applies default scope to outer query without affecting recursive terms' do
+      expect(result).to eq [scoped_child_2, scoped_child_1, scoped_root]
+    end
+  end
 end

data/spec/schema.rb

@@ -13,4 +13,9 @@ ActiveRecord::Schema.define(version: 0) do
     t.column :category_id, :integer
     t.column :title, :string
   end
+
+  create_table :model_with_default_scopes, force: true do |t|
+    t.column :parent_id, :integer
+    t.column :name, :string
+  end
 end

data/spec/support/models.rb

@@ -42,3 +42,9 @@ end
 class Article < ActiveRecord::Base
   belongs_to :category
 end
+
+class ModelWithDefaultScope < ActiveRecord::Base
+  belongs_to :parent, class_name: 'ModelWithDefaultScope'
+
+  default_scope -> { order('name ASC') }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord