torque-postgresql 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302ae61bb97f2666a7c1ada70d7b3ff2a2c5e9dd5230438fe8746ddf5933dcb3
-  data.tar.gz: 96771655afc7ea3a863c1069783e42858e7e27539e98724eb428f0d8d759ceb5
+  metadata.gz: 5ac2d4e3c96cf93edeac515986a6b7ba3ca412712c6eb19a38f09e0b0e5e448a
+  data.tar.gz: 133b756202e8e39738d7bda361f3fd9544829ef817b7ac518f972bf175da93c1
 SHA512:
-  metadata.gz: 4da7ce39ab52a21dc00a0b1922e02296f96ffb3c4b8fe3c9c8e590a25482a9d04c17ab348e7da00259e5ae4c53865b512740d21e8bdf1f60c069955f4e58350e
-  data.tar.gz: 5309c59fc60b31a0c4e37056e836951b4f9652104c757b687be9f5c93ddb8629ed0f5ad8de054dd84a5a7f5d4ec9b8527a767c6f6a8776527d91e94eb5cba15d
+  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/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/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '1.1.6'
+    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.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails