torque-postgresql 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 261ea2ffc412c3f06c841be868141f631fa9f983
-  data.tar.gz: e5f58518bcc173eaa8be19ea24e25f086546e78c
+SHA256:
+  metadata.gz: 5ac2d4e3c96cf93edeac515986a6b7ba3ca412712c6eb19a38f09e0b0e5e448a
+  data.tar.gz: 133b756202e8e39738d7bda361f3fd9544829ef817b7ac518f972bf175da93c1
 SHA512:
-  metadata.gz: 2742264fd62ee56eea953349bd95dc441d37948e2ebce6e8acb69ec200aabab5ca95e016ad7654b6626fc4bac465797abf88e3bd259f5149f2e3d60f74cae566
-  data.tar.gz: 879d2eb8e794009a63f1d69ea85b967a126709b242cee0fd9ccac6d1ad4734e8ca62aa69413c708b47c692557e1b935ed759562caebae56bc48e85afe3269bc9
+  metadata.gz: '08a2cb8062f7bdcf6497f4c2b33dc102c6df5d45ed5c82f6c772caeddb02f7a87056b06b13e6c09359b9db52dff46eabcb64f644e17682b1f830fdd988ff44ea'
+  data.tar.gz: f419dd80f7a3c9972b0eb469ed63bf5454ede498ee688761f7c99587db8b2d48d06b5b40e4696a1760ea077f750d966a9e67a500b5b2d4b8b0fa3fccc1c0f884

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -28,11 +28,11 @@ module Torque
         end
 
         def ids_reader
-          owner[reflection.active_record_primary_key]
+          owner[source_attr]
         end
 
         def ids_writer(new_ids)
-          column = reflection.active_record_primary_key
+          column = source_attr
           owner.update_column(column, owner[column] = new_ids.presence)
           @association_scope = nil
         end
@@ -40,8 +40,8 @@ module Torque
         def insert_record(record, *)
           super
 
-          attribute = (ids_reader || owner[reflection.active_record_primary_key] = [])
-          attribute.push(record[klass_fk])
+          attribute = (ids_reader || owner[source_attr] = [])
+          attribute.push(record[klass_attr])
           record
         end
 
@@ -50,8 +50,8 @@ module Torque
         end
 
         def include?(record)
-          list = owner[reflection.active_record_primary_key]
-          ids_reader && ids_reader.include?(record[klass_fk])
+          list = owner[source_attr]
+          ids_reader && ids_reader.include?(record[klass_attr])
         end
 
         private
@@ -65,7 +65,7 @@ module Torque
           # When the idea is to nulligy the association, then just set the owner
           # +primary_key+ as empty
           def delete_count(method, scope, ids = nil)
-            ids ||= scope.pluck(klass_fk)
+            ids ||= scope.pluck(klass_attr)
             scope.delete_all if method == :delete_all
             remove_stash_records(ids)
           end
@@ -76,13 +76,13 @@ module Torque
 
           # Deletes the records according to the <tt>:dependent</tt> option.
           def delete_records(records, method)
-            ids = Array.wrap(records).each_with_object(klass_fk).map(&:[])
+            ids = Array.wrap(records).each_with_object(klass_attr).map(&:[])
 
             if method == :destroy
               records.each(&:destroy!)
               remove_stash_records(ids)
             else
-              scope = self.scope.where(klass_fk => records)
+              scope = self.scope.where(klass_attr => records)
               delete_count(method, scope, ids)
             end
           end
@@ -98,10 +98,14 @@ module Torque
             ids_writer(ids_reader - Array.wrap(ids))
           end
 
-          def klass_fk
+          def source_attr
             reflection.foreign_key
           end
 
+          def klass_attr
+            reflection.active_record_primary_key
+          end
+
           def difference(a, b)
             a - b
           end

data/lib/torque/postgresql/associations/preloader.rb

@@ -5,7 +5,15 @@ unless Torque::PostgreSQL::AR521
     module PostgreSQL
       module Associations
         module Preloader
-          BelongsToMany = Class.new(::ActiveRecord::Associations::Preloader::HasMany)
+          class BelongsToMany < ::ActiveRecord::Associations::Preloader::HasMany
+            def association_key_name
+              reflection.active_record_primary_key
+            end
+
+            def owner_key_name
+              reflection.foreign_key
+            end
+          end
 
           def preloader_for(reflection, owners, *)
             return AlreadyLoaded \

data/lib/torque/postgresql/autosave_association.rb

@@ -25,11 +25,11 @@ module Torque
         association = association_instance_get(reflection.name)
         return unless association
 
-        klass_fk = reflection.foreign_key
-        acpk = reflection.active_record_primary_key
+        klass_attr = reflection.active_record_primary_key
+        source_attr = reflection.foreign_key
 
-        records = association.target.each_with_object(klass_fk)
-        write_attribute(acpk, records.map(&:read_attribute).compact)
+        records = association.target.each_with_object(klass_attr)
+        write_attribute(source_attr, records.map(&:read_attribute).compact)
       end
     end
 

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,15 +118,21 @@ 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
       def build(base)
+        @bound_attributes.clear
+        @join_sources.clear
+
+        # Prepare all the data for the statement
         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 +295,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/config.rb

@@ -3,6 +3,8 @@ module Torque
     include ActiveSupport::Configurable
 
     # Stores a version check for compatibility purposes
+    AR510 = (ActiveRecord.gem_version >= Gem::Version.new('5.1.0'))
+    AR520 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.0'))
     AR521 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.1'))
     AR523 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.3'))
 

data/lib/torque/postgresql/reflection/belongs_to_many_reflection.rb

@@ -10,6 +10,10 @@ module Torque
           true
         end
 
+        def belongs_to?
+          true
+        end
+
         def collection?
           true
         end
@@ -19,7 +23,7 @@ module Torque
         end
 
         def foreign_key
-          @foreign_key ||= options[:primary_key] || derive_foreign_key.freeze
+          @foreign_key ||= options[:foreign_key] || derive_foreign_key.freeze
         end
 
         def association_foreign_key
@@ -27,16 +31,46 @@ module Torque
         end
 
         def active_record_primary_key
-          @active_record_primary_key ||= options[:foreign_key] || derive_primary_key
+          @active_record_primary_key ||= options[:primary_key] || derive_primary_key
+        end
+
+        unless PostgreSQL::AR510
+          def join_keys(*)
+            JoinKeys.new(join_pk, join_fk)
+          end
+        end
+
+        if PostgreSQL::AR520
+          def join_primary_key(*)
+            active_record_primary_key
+          end
+
+          def join_foreign_key
+            foreign_key
+          end
+        else
+          def join_id_for(owner)
+            owner[foreign_key]
+          end
         end
 
         private
 
-          def derive_foreign_key
-            klass.primary_key
+          unless PostgreSQL::AR520
+            def join_pk(*)
+              active_record_primary_key
+            end
+
+            def join_fk
+              foreign_key
+            end
           end
 
           def derive_primary_key
+            klass.primary_key
+          end
+
+          def derive_foreign_key
             "#{name.to_s.singularize}_ids"
           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/schema_dumper.rb

@@ -31,21 +31,21 @@ module Torque
           if inherited_tables.present?
             stream.puts "  # These are tables that has inheritance"
             inherited_tables.each do |table_name, inherits|
-              unless ignored?(table_name)
-                sub_stream = StringIO.new
-                table(table_name, sub_stream)
-
-                # Add the inherits setting
-                sub_stream.rewind
-                inherits.map!(&:to_sym)
-                inherits = inherits.first if inherits.size === 1
-                inherits = ", inherits: #{inherits.inspect} do |t|"
-                table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
-
-                # Ensure bodyless definitions
-                table_dump.gsub!(/do \|t\|\n  end/, '')
-                stream.print table_dump
-              end
+              next if ignored?(table_name)
+
+              sub_stream = StringIO.new
+              table(table_name, sub_stream)
+
+              # Add the inherits setting
+              sub_stream.rewind
+              inherits.map!(&:to_sym)
+              inherits = inherits.first if inherits.size === 1
+              inherits = ", inherits: #{inherits.inspect} do |t|"
+              table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
+
+              # Ensure bodyless definitions
+              table_dump.gsub!(/do \|t\|\n  end/, '')
+              stream.print table_dump
             end
           end
 
@@ -55,6 +55,9 @@ module Torque
               foreign_keys(tbl, stream) unless ignored?(tbl)
             end
           end
+
+          # Scenic integration
+          views(stream) if defined?(::Scenic)
         end
 
         # Dump user defined types like enum
@@ -63,7 +66,7 @@ module Torque
           return unless types.any?
 
           stream.puts "  # These are user-defined types used on this database"
-          types.each { |name, type| send(type.to_sym, name, stream) }
+          types.sort_by(&:first).each { |name, type| send(type.to_sym, name, stream) }
           stream.puts
         rescue => e
           stream.puts "# Could not dump user-defined types because of following #{e.class}"

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '1.1.2'
+    VERSION = '1.1.7'
   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.7
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -260,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources