activerecord-cte 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99aec3bf8a3947e2c887a63ca0b2d689987774c0af840b333217a87e5b9d94df
-  data.tar.gz: dac179b4c433590c7b20c6062361e827de39c62aae2c6aae61304b9e9ffaca04
+  metadata.gz: e2fbfad4eca9d8be81cde9c22367e6cf29020baad9411acfffe4abe2f51d99fe
+  data.tar.gz: 39cacb9b310c315c5e0fff63a88903e69b4a618b324f0bcabfe78f4b70530a01
 SHA512:
-  metadata.gz: 2e7d6031d0ecab21c7b7b80e265b4397155f4ac0ae9aa40e70cc800a9ad3631889a303418ac17b9d7f21076682c045ed750d1b1c34b8d801ff4ad59d33cfefee
-  data.tar.gz: 239f8aba0becd85787d49ed1b6a4102e94a3e5b77d375591cddc5df98bd5bd307c2828eb900cc8d056ba71a4f57d4b193aa924330d2bf8c3b6af3c37f6017cef
+  metadata.gz: b1a1428a7916fd20c25d758a68cbcc9d39c3e737e462b01467226cc4a7fec68ad86fce2aadd7c2452170979cd8e7bff6fc0026e51a15a886e4bee8ea42eb6332
+  data.tar.gz: 488b14ed1cff2d0271188eeb0457432a38eb51637c44d4e2015ca1624ee646c42b426a7cb8f583b94f8baadc2e90abf2fd59d5aa3bc8d70b3c5a22746c631457

data/lib/activerecord/cte/core_ext.rb

@@ -4,8 +4,31 @@ module ActiveRecord
   module Querying
     delegate :with, to: :all
   end
+  
+  module WithMerger
+    def normal_values
+      super + %i[with]
+    end
+
+    def merge
+      super
+      merge_withs
+      relation
+    end
+
+    private
+
+    def merge_withs
+      other_values = other.with_values.reject { |value| relation.with_values.include?(value) }
+      relation.with!(*other_values) if other_values.any?
+    end
+  end
 
   class Relation
+    class Merger
+      prepend WithMerger
+    end
+
     def with(opts, *rest)
       spawn.with!(opts, *rest)
     end

data/lib/activerecord/cte/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Cte
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cte
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Vlado Cingel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord