torque-postgresql 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9085a88f0ef5d87a1cb95bdaf82fac432c7857ef97f485df3d20b27dab2a814
-  data.tar.gz: 0252a645b4c6f3422c296f621155f7c78d82d10a4d296a8f46616abfade3e481
+  metadata.gz: 9e426686cf04fcf990d84b945abe3b3435168237f1ff24c6f23ac3b4941bbc4e
+  data.tar.gz: 2f936f5676f80804e4766bc9bf64b81d70ddbd08e9409b373b0d59d7d20e8bf1
 SHA512:
-  metadata.gz: 54593a0e4e7e25de241904f72ed3c016447f24ab93668d80f2c2b84d6f8e10689d3dc8749012cd6b20c1b45c33d3d1b5dd3124ee8d7c9bef659507ef3c85e2ea
-  data.tar.gz: a58ae7a09eeaf9afdef0c3f1fbff5c7a7a96d671d913c33d57d286230b3c939888d1c985fe09ab8991896698a98f2b63d8f977ed251670ad4753dd26e73fa124
+  metadata.gz: 373d085090e02e76eb2523f7c2d5a32434c002f712cf892aa38f81bc9935a51f2426054c97bb5df534c47e23fd1800d84b670b9443266908e2f076f20928e7a2
+  data.tar.gz: f0441cc66de2ed015d0b8dbb13ae88dc4074a54c8477fc7a31fc1d51e2bfd7cb57ab0e3de529dcbd4feb3fa72dd1fc8894738868e8bfa36ad9490badc3d1c990

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
           command = owner.persisted? ? :update_column : :write_attribute
           owner.public_send(command, column, new_ids.presence)
           @association_scope = nil
@@ -41,8 +41,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
 
@@ -51,8 +51,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
@@ -66,7 +66,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
@@ -77,13 +77,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
@@ -99,10 +99,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/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/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,24 @@ 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
+
+        def join_primary_key(*)
+          active_record_primary_key
+        end
+
+        def join_foreign_key
+          foreign_key
         end
 
         private
 
-          def derive_foreign_key
+          def derive_primary_key
             klass.primary_key
           end
 
-          def derive_primary_key
+          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 = '2.0.2'
+    VERSION = '2.0.3'
   end
 end

data/spec/tests/belongs_to_many_spec.rb

@@ -35,6 +35,11 @@ RSpec.describe 'BelongsToMany' do
       expect(subject._reflections).to include('tags')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['tags']
+      expect(item.foreign_key).to be_eql('tag_ids')
+    end
+
     it 'loads associated records' do
       subject.update(tag_ids: [initial.id])
       expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
@@ -116,6 +121,7 @@ RSpec.describe 'BelongsToMany' do
 
       subject.tags.concat(other.new(name: 'Test'))
       subject.tags.reload
+
       expect(subject.tags.size).to be_eql(2)
       expect(subject.tag_ids.size).to be_eql(2)
       expect(subject.tags.last.name).to be_eql('Test')

data/spec/tests/has_many_spec.rb

@@ -21,6 +21,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('texts')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['texts']
+      expect(item.foreign_key).to be_eql('user_id')
+    end
+
     it 'loads associated records' do
       expect(subject.texts.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "texts"\\.\\* FROM "texts" WHERE \\(?"texts"\\."user_id" = #{subject.id}\\)?
@@ -210,6 +215,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('videos')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['videos']
+      expect(item.foreign_key).to be_eql('tag_ids')
+    end
+
     it 'loads associated records' do
       expect(subject.videos.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "videos"\\.\\* FROM "videos"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails