torque-postgresql 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8dfe147f5a65e1626923bff250d8c057c73e2fc2c2f2ea6812d67537da32e38
-  data.tar.gz: 3205fea618ea9da4d9aeccf3b5d48e3dff72a4a670e181c78c9b9a0b9896cfbf
+  metadata.gz: 7afebc02d5b903b8ddb8cfdee36ff8260d1c82977943f2fadbb63771902c6c44
+  data.tar.gz: 89a55ffc034942f5b49dac3693fc3ed95fc6a0d49a01586c2b58a0c26086e2de
 SHA512:
-  metadata.gz: ce88617dcacc292754245e9fff7f7dba62ec672a5b7b4760fff2ff2b28b4b25be7e8413b92bf509f5f9f9c4d0b096559b7ec46de4fdce5294181c363f34367fb
-  data.tar.gz: 6c3e8e96edd6b906bd2f0038869f9f15596fad7f22745c5bd63c08b623a55cf97f6185877206dac54a7e93e81ce5d7644bfeb048e7e2db1780bb7cadc7843159
+  metadata.gz: 168d3558d8ba7ac6862b39301381edcfd23a208bfd24293fc957a53243327b561d1063fc794bbedf741bcca12cd6fd3f3460999b3674300ed6f1171e510fcc51
+  data.tar.gz: '09859ddf3c06760d276fe25df11e8817168115cbea4ce971b86884ef3ed39428cc0292a885c10300e720d9a1b2f1c3da35dff40532f24fab96f13bb4b122f19c'

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

@@ -12,9 +12,9 @@ module Torque
         ## CUSTOM
         def ids_reader
           if loaded?
-            target.pluck(reflection.association_primary_key)
+            target.pluck(reflection.active_record_primary_key)
           elsif !target.empty?
-            load_target.pluck(reflection.association_primary_key)
+            load_target.pluck(reflection.active_record_primary_key)
           else
             stale_state || column_default_value
           end

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

@@ -25,7 +25,7 @@ module Torque
         end
 
         def foreign_key
-          @foreign_key ||= options[:foreign_key] || derive_foreign_key.freeze
+          @foreign_key ||= options[:foreign_key]&.to_s || derive_foreign_key.freeze
         end
 
         def association_foreign_key
@@ -33,7 +33,7 @@ module Torque
         end
 
         def active_record_primary_key
-          @active_record_primary_key ||= options[:primary_key] || derive_primary_key
+          @active_record_primary_key ||= options[:primary_key]&.to_s || derive_primary_key
         end
 
         def join_primary_key(*)

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '3.3.1'
+    VERSION = '3.3.3'
   end
 end

data/spec/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 2
+version = 3
 
 return if ActiveRecord::Migrator.current_version == version
 ActiveRecord::Schema.define(version: version) do
@@ -77,14 +77,14 @@ ActiveRecord::Schema.define(version: version) do
   create_table "texts", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "content"
-    t.enum     "conflict",  enum_type: :conflicts
+    t.enum     "conflict", enum_type: :conflicts
   end
 
   create_table "comments", force: :cascade do |t|
-    t.integer "user_id",    null: false
+    t.integer "user_id", null: false
     t.integer "comment_id"
     t.integer "video_id"
-    t.text    "content",    null: false
+    t.text    "content", null: false
     t.string  "kind"
     t.index ["user_id"], name: "index_comments_on_user_id", using: :btree
     t.index ["comment_id"], name: "index_comments_on_comment_id", using: :btree
@@ -92,7 +92,7 @@ ActiveRecord::Schema.define(version: version) do
 
   create_table "courses", force: :cascade do |t|
     t.integer  "category_id"
-    t.string   "title",      null: false
+    t.string   "title", null: false
     t.interval "duration"
     t.enum     "types", enum_type: :types, array: true
     t.datetime "created_at", null: false
@@ -108,7 +108,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "activity_id"
     t.string   "title"
     t.text     "content"
-    t.enum     "status",    enum_type: :content_status
+    t.enum     "status", enum_type: :content_status
     t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
   end
 
@@ -120,8 +120,8 @@ ActiveRecord::Schema.define(version: version) do
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "name",       null: false
-    t.enum     "role",                    enum_type: :roles, default: :visitor
+    t.string   "name", null: false
+    t.enum     "role", enum_type: :roles, default: :visitor
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "author_id"
     t.string   "title"
     t.boolean  "active"
-    t.enum     "kind",                    enum_type: :types
+    t.enum     "kind", enum_type: :types
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

data/spec/tests/belongs_to_many_spec.rb

@@ -20,6 +20,14 @@ RSpec.describe 'BelongsToMany' do
 
       model.belongs_to_many(:tests)
     end
+
+    it 'allows setting up foreign key and primary_key as symbol' do
+      model.belongs_to_many(:tests, foreign_key: :test_ids, primary_key: :test_id)
+
+      reflection = model._reflections['tests']
+      expect(reflection.foreign_key).to be_eql('test_ids')
+      expect(reflection.active_record_primary_key).to be_eql('test_id')
+    end
   end
 
   context 'on association' do
@@ -359,7 +367,7 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
 
-    context 'When the attribute has a default value' do
+    context 'when the attribute has a default value' do
       subject { FactoryBot.create(:item) }
 
       it 'will always return the column default value' do
@@ -382,7 +390,7 @@ RSpec.describe 'BelongsToMany' do
       end
     end
 
-    context 'When record is not persisted' do
+    context 'when record is not persisted' do
       let(:initial) { FactoryBot.create(:tag) }
 
       subject { Video.new(title: 'A', tags: [initial]) }
@@ -400,7 +408,7 @@ RSpec.describe 'BelongsToMany' do
     let(:player) { Class.new(ActiveRecord::Base) }
     let(:other) { player.create }
 
-    # TODO: Set as a shred example
+    # TODO: Set as a shared example
     before do
       connection.create_table(:players, id: :uuid) { |t| t.string :name }
       connection.create_table(:games, id: :uuid) { |t| t.uuid :player_ids, array: true }
@@ -440,4 +448,45 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
   end
+
+  context 'using custom keys' do
+    let(:connection) { ActiveRecord::Base.connection }
+    let(:post) { Post }
+    let(:tag) { Tag }
+    let(:tags) { %w[a b c].map { |id| create(:tag, friendly_id: id) } }
+
+    subject { create(:post) }
+
+    before do
+      connection.add_column(:tags, :friendly_id, :string)
+      connection.add_column(:posts, :friendly_tag_ids, :string, array: true)
+      post.belongs_to_many(:tags, foreign_key: :friendly_tag_ids, primary_key: :friendly_id)
+      post.reset_column_information
+      tag.reset_column_information
+    end
+
+    after do
+      tag.reset_column_information
+      post.reset_column_information
+      post._reflections.delete(:tags)
+    end
+
+    it 'loads associated records' do
+      subject.update(friendly_tag_ids: tags.pluck(:friendly_id))
+
+      expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
+        SELECT "tags".* FROM "tags" WHERE "tags"."friendly_id" IN ('a', 'b', 'c')
+      SQL
+
+      expect(subject.tags.load).to be_a(ActiveRecord::Associations::CollectionProxy)
+      expect(subject.tags.to_a).to be_eql(tags)
+    end
+
+    it 'can properly assign tags' do
+      expect(subject.friendly_tag_ids).to be_blank
+
+      subject.tags = tags
+      expect(subject.friendly_tag_ids).to be_eql(%w[a b c])
+    end
+  end
 end

data/spec/tests/distinct_on_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe 'DistinctOn' do
     end
 
     it 'raises with invalid relation' do
-      expect { subject.distinct_on(tags: :name).to_sql }.to \
+      expect { subject.distinct_on(supervisors: :name).to_sql }.to \
         raise_error(ArgumentError, /Relation for/)
     end
 

data/spec/tests/relation_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe 'Relation', type: :helper do
     end
 
     it 'raises on relation not present' do
-      check = [tags: :name]
+      check = [supervisors: :name]
       expect{ subject.call(check) }.to raise_error(ArgumentError, /Relation for/)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails