activerecord-hierarchical_query 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f6d79b615d8ca821c2258b9287f10044ed997c
-  data.tar.gz: 4dc56871743b3a2d9bd2dc920d1195894dfc8aa5
+  metadata.gz: f07d2ec47ffaa6e83ba6fb27cb027773298ad8dc
+  data.tar.gz: cde6840a2e9f1334185a747ac5467850653dfa3d
 SHA512:
-  metadata.gz: 7cd10f34571215ba462f81ebd552667a432f38bfd7f84eb4cc25c05dcc006623c0b7f4e0f4f24211f1bd2874ce4458bee0bec1a43db61109cd7227105606c4fc
-  data.tar.gz: 2936034c375afb978a9c5b5a8f7c69cc4cd36690315affa3c1e3fde2433b84fbf20eb3a07cac37461f672ea5f753702c4045cf1566c1da6df3cdcce393fe8252
+  metadata.gz: 3f009457c44deec3eef278505d1e898141fce5e730ddf9245783cfa19efa4245b5c2ed4c4e7b61df45307e476fcbf2138aabc714815d96fc83048e9b35c0c12c
+  data.tar.gz: cbcdb8aa27269c2a6011b1c35a160a280af281c23ce7c2e07bdac044703f26bf06a733f7fafc78e4a9addc4f2493b03690202a880a65d6e15b798e225090c929

data/lib/active_record/hierarchical_query.rb

@@ -50,4 +50,4 @@ ActiveSupport.on_load(:active_record, yield: true) do |base|
   end
 
   ActiveRecord::Relation.send :include, ActiveRecord::HierarchicalQuery
-end
+end

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

@@ -11,15 +11,17 @@ module ActiveRecord
       class QueryBuilder
         attr_reader :query,
                     :columns,
-                    :cycle_detector
+                    :cycle_detector,
+                    :options
 
         delegate :klass, :table, :recursive_table, to: :query
 
         # @param [ActiveRecord::HierarchicalQuery::Query] query
-        def initialize(query)
+        def initialize(query, options: {})
           @query = query
           @columns = Columns.new(@query)
           @cycle_detector = CycleDetector.new(@query)
+          @options = options
         end
 
         def bind_values

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

@@ -44,4 +44,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

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

@@ -15,10 +15,17 @@ module ActiveRecord
         end
 
         def arel
-          non_recursive_term.arel.union(:all, recursive_term.arel)
+          non_recursive_term.arel.union(union_type, recursive_term.arel)
         end
 
         private
+
+        def union_type
+          return @builder.options[:union_type] if @builder.options[:union_type].present?
+
+          :all
+        end
+
         def recursive_term
           @rt ||= RecursiveTerm.new(@builder)
         end
@@ -29,4 +36,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/active_record/hierarchical_query/join_builder.rb

@@ -8,7 +8,7 @@ module ActiveRecord
       # @param [#to_s] subquery_alias
       def initialize(query, join_to, subquery_alias, options = {})
         @query = query
-        @builder = CTE::QueryBuilder.new(query)
+        @builder = CTE::QueryBuilder.new(query, options: options)
         @relation = join_to
         @alias = Arel::Table.new(subquery_alias, ActiveRecord::Base)
         @options = options

data/lib/active_record/hierarchical_query/query.rb

@@ -99,10 +99,10 @@ module ActiveRecord
           object = @start_with_value || @klass
 
           @start_with_value = if block.arity == 0
-                                object.instance_eval(&block)
-                              else
-                                block.call(object)
-                              end
+            object.instance_eval(&block)
+          else
+            block.call(object)
+          end
         end
 
         self

data/lib/active_record/hierarchical_query/version.rb

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

data/lib/arel/nodes/postgresql.rb

@@ -13,6 +13,9 @@ module Arel
 
     class ArrayConcat < Binary
     end
+
+    class UnionDistinct < Binary
+    end
   end
 
   module Visitors
@@ -30,6 +33,10 @@ module Arel
         def visit_Arel_Nodes_ArrayConcat o, *a
           "#{visit o.left, *a} #{ARRAY_CONCAT} #{visit o.right, *a}"
         end
+
+        def visit_Arel_Nodes_UnionDistinct o, *a
+          "( #{visit o.left, *a} UNION DISTINCT #{visit o.right, *a} )"
+        end
       else
         def visit_Arel_Nodes_PostgresArray o, collector
           collector << ARRAY_OPENING
@@ -42,7 +49,12 @@ module Arel
           collector << ARRAY_CONCAT
           visit o.right, collector
         end
+
+        def visit_Arel_Nodes_UnionDistinct o, collector
+          collector << "( "
+          infix_value(o, collector, " UNION DISTINCT ") << " )"
+        end
       end
     end
   end
-end
+end

data/spec/active_record/hierarchical_query_spec.rb

@@ -11,6 +11,33 @@ describe ActiveRecord::HierarchicalQuery do
   let!(:child_5) { klass.create(parent: child_4) }
 
   describe '#join_recursive' do
+    describe 'UNION clause' do
+      let(:options) { {} }
+      subject { klass.join_recursive(options) { connect_by(id: :parent_id) }.to_sql }
+
+      it 'defaults to UNION ALL' do
+        expect(subject).to include('UNION ALL')
+      end
+
+      context 'specifying DISTINCT union type' do
+        let(:options) { { union_type: :distinct } }
+
+        it 'uses UNION DISTINCT' do
+          expect(subject).to include('UNION DISTINCT')
+          expect(subject).to_not include('UNION ALL')
+        end
+      end
+
+      context 'specifying ALL union type' do
+        let(:options) { { union_type: :all } }
+
+        it 'uses UNION ALL' do
+          expect(subject).to include('UNION ALL')
+          expect(subject).to_not include('UNION DISTINCT')
+        end
+      end
+    end
+
     describe 'CONNECT BY clause' do
       it 'throws error if CONNECT BY clause not specified' do
         expect {

data/spec/database.yml

@@ -1,5 +1,4 @@
 pg:
   adapter: postgresql
   database: hierarchical_query_test
-  username: vagrant
-  min_messages: ERROR
+  min_messages: ERROR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query