activerecord-hierarchical_query 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f07d2ec47ffaa6e83ba6fb27cb027773298ad8dc
-  data.tar.gz: cde6840a2e9f1334185a747ac5467850653dfa3d
+  metadata.gz: c51bb399108f367e30e8bde8ea46171451212228
+  data.tar.gz: 385d34aa8caa4777f50e0a2c8a7b9d84c0c30dd1
 SHA512:
-  metadata.gz: 3f009457c44deec3eef278505d1e898141fce5e730ddf9245783cfa19efa4245b5c2ed4c4e7b61df45307e476fcbf2138aabc714815d96fc83048e9b35c0c12c
-  data.tar.gz: cbcdb8aa27269c2a6011b1c35a160a280af281c23ce7c2e07bdac044703f26bf06a733f7fafc78e4a9addc4f2493b03690202a880a65d6e15b798e225090c929
+  metadata.gz: d3bad1f4d790f159e86c1870184e43afc7b3c196394b8330d52b8cd25a582ba098b609cf2193213017838fb426f2cdebf22c53ce8b372bb211cb272c95bd7332
+  data.tar.gz: 02b43b6cfb15595885d4d326b6ddd6cced8c34fc7d8dff3c7c1aa11eca5119852276b7d3238f78f13f6634bc9fd62b8e5eaf72505a30aff1f201d4c50d60b731

data/README.md

@@ -246,7 +246,7 @@ end
 
 ## DISTINCT
 By default, the union term in the Common Table Expression uses a `UNION ALL`. If you want
-to `SELECT DISTINCT` CTE values, add a query option for  `distinct`
+to `SELECT DISTINCT` CTE values, add a query option for  `distinct`:
 ```ruby
 Category.join_recursive do |query|
   query.connect_by(id: :parent_id)
@@ -255,6 +255,14 @@ Category.join_recursive do |query|
 end
 ```
 
+If you want to join CTE terms by `UNION DISTINCT`, pass an option to `join_recursive`:
+```ruby
+Category.join_recursive(union_type: :distinct) do |query|
+  query.connect_by(id: :parent_id)
+       .start_with(id: node_1.id)
+end
+```
+
 ## Generated SQL queries
 
 Under the hood this extensions builds `INNER JOIN` to recursive subquery.

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

@@ -56,11 +56,11 @@ module ActiveRecord
         end
 
         def union_term
-          @union_term ||= UnionTerm.new(self)
+          @union_term ||= UnionTerm.new(self, @options)
         end
 
         def build_select
-          if @query.distinct_value == true
+          if @query.distinct_value
             @arel.project(recursive_table[Arel.star]).distinct
           else
             @arel.project(recursive_table[Arel.star])

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

@@ -6,8 +6,9 @@ module ActiveRecord
     module CTE
       class UnionTerm
         # @param [ActiveRecord::HierarchicalQuery::CTE::QueryBuilder] builder
-        def initialize(builder)
+        def initialize(builder, options = {})
           @builder = builder
+          @union_type = options.fetch(:union_type, :all)
         end
 
         def bind_values
@@ -19,12 +20,7 @@ module ActiveRecord
         end
 
         private
-
-        def union_type
-          return @builder.options[:union_type] if @builder.options[:union_type].present?
-
-          :all
-        end
+        attr_reader :union_type
 
         def recursive_term
           @rt ||= RecursiveTerm.new(@builder)

data/lib/active_record/hierarchical_query/join_builder.rb

@@ -6,6 +6,7 @@ module ActiveRecord
       # @param [ActiveRecord::HierarchicalQuery::Query] query
       # @param [ActiveRecord::Relation] join_to
       # @param [#to_s] subquery_alias
+      # @param [Hash] options (:outer_join_hierarchical, :union_type)
       def initialize(query, join_to, subquery_alias, options = {})
         @query = query
         @builder = CTE::QueryBuilder.new(query, options: options)
@@ -15,13 +16,7 @@ module ActiveRecord
       end
 
       def build
-        # outer joins to include non-hierarchical entries if specified
-        # default option when flag is not specified is to include only entries participating
-        # in a hierarchy
-        join_sql = @options[:outer_join_hierarchical] == true ? outer_join.to_sql : inner_join.to_sql
-
-        relation = @relation.joins(join_sql)
-
+        relation = @relation.joins(joined_arel_node)
         # copy bound variables from inner subquery (remove duplicates)
         relation.bind_values |= bind_values
         # add ordering by "__order_column"
@@ -31,6 +26,10 @@ module ActiveRecord
       end
 
       private
+      def joined_arel_node
+        @options[:outer_join_hierarchical] == true ? outer_join : inner_join
+      end
+
       def inner_join
         Arel::Nodes::InnerJoin.new(aliased_subquery, constraint)
       end
@@ -40,7 +39,7 @@ module ActiveRecord
       end
 
       def aliased_subquery
-        Arel::Nodes::As.new(subquery, @alias)
+        SubqueryAlias.new(subquery, @alias)
       end
 
       def subquery
@@ -78,6 +77,16 @@ module ActiveRecord
       def order_columns
         [@query.recursive_table[@query.ordering_column_name].asc]
       end
+
+      # This node is required to support joins to aliased Arel nodes
+      class SubqueryAlias < Arel::Nodes::As
+        attr_reader :table_name
+
+        def initialize(subquery, alias_node)
+          super
+          @table_name = alias_node.name
+        end
+      end
     end
   end
 end

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/active_record/hierarchical_query_spec.rb

@@ -306,4 +306,26 @@ describe ActiveRecord::HierarchicalQuery do
       end
     end
   end
+
+  describe 'Testing bind variables' do
+    let!(:article) { Article.create!(category: child_2, title: 'Alpha') }
+
+    let(:subquery) do
+      klass.join_recursive do |query|
+        query.
+          start_with(parent_id: child_1.id).
+          connect_by(id: :parent_id)
+      end
+    end
+
+    let(:outer_query) do
+      Article.where(category_id: subquery, title: 'Alpha')
+    end
+
+    subject(:result) { outer_query.to_a }
+
+    it 'returns result without throwing an error' do
+      expect(result).to include(article)
+    end
+  end
 end

data/spec/schema.rb

@@ -7,4 +7,9 @@ ActiveRecord::Schema.define(version: 0) do
     t.column :depth, :integer
     t.column :position, :integer
   end
-end
+
+  create_table :articles, force: true do |t|
+    t.column :category_id, :integer
+    t.column :title, :string
+  end
+end

data/spec/support/models.rb

@@ -16,6 +16,7 @@ class Category < ActiveRecord::Base
 
   belongs_to :parent, class_name: 'Category'
   has_many :children, class_name: 'Category'
+  has_many :articles
 
   before_save :generate_name, unless: :name?
   before_save :count_depth
@@ -36,4 +37,8 @@ class Category < ActiveRecord::Base
   def ancestors
     parent ? parent.ancestors + [parent] : []
   end
-end
+end
+
+class Article < ActiveRecord::Base
+  belongs_to :category
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,4 +158,3 @@ test_files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/models.rb
-has_rdoc: