torque-postgresql 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261ea2ffc412c3f06c841be868141f631fa9f983
-  data.tar.gz: e5f58518bcc173eaa8be19ea24e25f086546e78c
+  metadata.gz: 3468167ca09838e3f5b9b5ee2194a8abf3ef0fa3
+  data.tar.gz: b420e7368ee61c27affe8011d521f273ae5cf66f
 SHA512:
-  metadata.gz: 2742264fd62ee56eea953349bd95dc441d37948e2ebce6e8acb69ec200aabab5ca95e016ad7654b6626fc4bac465797abf88e3bd259f5149f2e3d60f74cae566
-  data.tar.gz: 879d2eb8e794009a63f1d69ea85b967a126709b242cee0fd9ccac6d1ad4734e8ca62aa69413c708b47c692557e1b935ed759562caebae56bc48e85afe3269bc9
+  metadata.gz: 5e4921feec33642988fe1f231acfeeada12f68d64fd29bcce654244bed6c0ce8d8a12a6008b092e64205d4165bff7817b895ed033f9fd5dfd916dbf38a7f77ab
+  data.tar.gz: 0505c199a892c273cf5fe8c523a5be2028be06c319887dd1423275b17026923c99b79799a6f608203e0491cbafab64f8085300cdde0aab03ce8b7e45467c44af

data/lib/torque/postgresql/auxiliary_statement.rb

@@ -31,11 +31,12 @@ module Torque
         end
 
         # Fast access to statement build
-        def build(statement, base, options = nil, bound_attributes = [])
+        def build(statement, base, options = nil, bound_attributes = [], join_sources = [])
           klass = instantiate(statement, base, options)
           result = klass.build(base)
 
           bound_attributes.concat(klass.bound_attributes)
+          join_sources.concat(klass.join_sources)
           result
         end
 
@@ -105,7 +106,7 @@ module Torque
       delegate :config, :table, :table_name, :relation, :configure, :relation_query?,
         to: :class
 
-      attr_reader :bound_attributes
+      attr_reader :bound_attributes, :join_sources
 
       # Start a new auxiliary statement giving extra options
       def initialize(*args)
@@ -117,7 +118,9 @@ module Torque
         @where = options.fetch(:where, {})
         @select = options.fetch(:select, {})
         @join_type = options.fetch(:join_type, nil)
+
         @bound_attributes = []
+        @join_sources = []
       end
 
       # Build the statement on the given arel and return the WITH statement
@@ -125,7 +128,7 @@ module Torque
         prepare(base)
 
         # Add the join condition to the list
-        base.joins_values += [build_join(base)]
+        @join_sources << build_join(base)
 
         # Return the statement with its dependencies
         [@dependencies, ::Arel::Nodes::As.new(table, build_query(base))]
@@ -288,7 +291,7 @@ module Torque
               cte.is_a?(dependent_klass)
             end
 
-            AuxiliaryStatement.build(dependent, base, options, bound_attributes)
+            AuxiliaryStatement.build(dependent, base, options, bound_attributes, join_sources)
           end
         end
 

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -47,16 +47,16 @@ module Torque
 
           # Hook arel build to add the distinct on clause
           def build_arel(*)
-            subqueries = build_auxiliary_statements
-            return super if subqueries.nil?
-            super.with(subqueries)
+            arel = super
+            subqueries = build_auxiliary_statements(arel)
+            subqueries.nil? ? arel : arel.with(subqueries)
           end
 
           # Build all necessary data for auxiliary statements
-          def build_auxiliary_statements
-            return unless self.auxiliary_statements_values.present?
-            self.auxiliary_statements_values.map do |klass|
-              klass.build(self)
+          def build_auxiliary_statements(arel)
+            return unless auxiliary_statements_values.present?
+            auxiliary_statements_values.map do |klass|
+              klass.build(self).tap { arel.join_sources.concat(klass.join_sources) }
             end
           end
 

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails