activerecord-hierarchical_query 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3857ae3686fc8bc70d3fa51f68ce8b179c74565
-  data.tar.gz: 8ff21aff761065bdc8fe7af742607a53f1488b7f
+  metadata.gz: fb06a2b6a2d1c5e9d77bdcae7bcd93fc648a1d0f
+  data.tar.gz: 0a88b8b0bb779d4bab7395b02818574c7b2559dd
 SHA512:
-  metadata.gz: 47ba81111606890e77d4decb8b1dcb8e9f10ae0ff985b74aab7309133c159294227bed679b7d748ee644aa4646fac8eb29404bee0cdfede1689f15a35dded15b
-  data.tar.gz: 2d474936f08750e56f9a467d07ef8bc110e099154907f260f31f579ffed75690c9f70c384e6ca3cc48bb61f56706a26ef1f06298808a1fba77cec5576b66f0ca
+  metadata.gz: 4ae72dfaa66ce34d6a83967367afcf4d5b74883e77da4bc0b909c82d0a4fab442cd7b237e2dba8f9dc6fe6f3baa5eb2a2fbd3b297bc1481dc1a249f3110385de
+  data.tar.gz: d40b2571939dfb11d7579f62f03da854444bdb6555638db67b9fc735b386b5b900fec7f8aaf054b5566abcf91ab8a35b5a1b38a6616e3eefd03e663917a167b1

data/lib/active_record/hierarchical_query/join_builder.rb

@@ -17,8 +17,8 @@ module ActiveRecord
 
       def build
         relation = @relation.joins(joined_arel_node)
-        # copy bound variables from inner subquery (remove duplicates)
-        relation.bind_values |= bind_values
+        # copy bound variables from inner subquery
+        relation.bind_values += bind_values
         # add ordering by "__order_column"
         relation.order_values += order_columns if ordered?
 

data/lib/active_record/hierarchical_query/version.rb

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

data/spec/active_record/hierarchical_query_spec.rb

@@ -3,12 +3,13 @@ require 'spec_helper'
 describe ActiveRecord::HierarchicalQuery do
   let(:klass) { Category }
 
-  let!(:root) { klass.create }
-  let!(:child_1) { klass.create(parent: root) }
-  let!(:child_2) { klass.create(parent: child_1) }
-  let!(:child_3) { klass.create(parent: child_1) }
-  let!(:child_4) { klass.create(parent: root) }
-  let!(:child_5) { klass.create(parent: child_4) }
+  let(:trait_id) { 'trait' }
+  let!(:root) { klass.create(trait_id: trait_id) }
+  let!(:child_1) { klass.create(parent: root, trait_id: trait_id) }
+  let!(:child_2) { klass.create(parent: child_1, trait_id: trait_id) }
+  let!(:child_3) { klass.create(parent: child_1, trait_id: trait_id) }
+  let!(:child_4) { klass.create(parent: root, trait_id: trait_id) }
+  let!(:child_5) { klass.create(parent: child_4, trait_id: trait_id) }
 
   describe '#join_recursive' do
     describe 'UNION clause' do
@@ -313,8 +314,9 @@ describe ActiveRecord::HierarchicalQuery do
     let(:subquery) do
       klass.join_recursive do |query|
         query.
-          start_with(parent_id: child_1.id).
-          connect_by(id: :parent_id)
+          start_with(trait_id: trait_id, parent_id: child_1.id).
+          connect_by(id: :parent_id).
+          where(trait_id: trait_id)
       end
     end
 

data/spec/schema.rb

@@ -3,6 +3,7 @@ ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define(version: 0) do
   create_table :categories, force: true do |t|
     t.column :parent_id, :integer
+    t.column :trait_id, :string
     t.column :name, :string
     t.column :depth, :integer
     t.column :position, :integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexei Mikhailov