where_exists 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973c5c35ea3476b4178a7e2eb1f6ef93303d731922bf537e0d0d76e02a0f4372
-  data.tar.gz: 6b30a099f143b8bfbcdcc4ff82b24f4a35c8c566d69c86a68b7b41e9342fd1bd
+  metadata.gz: 6107147002f4b860ab5570fc7f23a5fc38ed39425b38c581b1951394986c925c
+  data.tar.gz: c7ed7a2d3432032a0c719e8298293ba38d875992b7abe76832654678023eccc5
 SHA512:
-  metadata.gz: a4386360276ae78d77f198690e06552a3c29ae08208749f580c4cfc78348b4c9dee005e8bb3f85fc182274926ef724b65daf605d9ba09159731aaf2ed2b8d353
-  data.tar.gz: 9f47044c93ea46798c0bff7bad10ae3b1558eff50d23c1778c681169ad3979878ba52de97f138f0d1fa0dc639148d16acf9b1320bed128763e49472aa55afae9
+  metadata.gz: c4cd31754b8044d2ad4ff7d55e84bd3959fa742a4527c0955994e3ba2797a1f34b6ab1bcd5fb347543fde2d8fc5d2e97e633a13bbdd26b985cb039b45ab220c2
+  data.tar.gz: 419074f831ceac51d19aaf53cda7ffc4ebd8d14e4246f5439702e251ab424068c30f9e4f8fc5344235fb03848cd1d4a92452c7007df2d35be399181b66cd2b40

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/lib/where_exists.rb

@@ -110,7 +110,7 @@ module WhereExists
       association = association.through_reflection
 
       case association.macro
-      when :has_many, :has_one
+      when :has_many, :has_one, :belongs_to
         return where_exists_for_has_many_query(association, {}, next_association, &block)
       when :has_and_belongs_to_many
         return where_exists_for_habtm_query(association, {}, next_association, &block)
@@ -128,10 +128,17 @@ module WhereExists
     association_scope = next_association[:scope] || association.scope
 
     associated_model = association.klass
-    primary_key = association.options[:primary_key] || self.primary_key
+
+    if association.macro == :belongs_to
+      foreign_key = association.options[:primary_key] || self.primary_key
+      primary_key = association.foreign_key
+    else
+      primary_key = association.options[:primary_key] || self.primary_key
+      foreign_key = association.foreign_key
+    end
 
     self_ids = quote_table_and_column_name(self.table_name, primary_key)
-    associated_ids = quote_table_and_column_name(associated_model.table_name, association.foreign_key)
+    associated_ids = quote_table_and_column_name(associated_model.table_name, foreign_key)
 
     result = associated_model.select("1").where("#{associated_ids} = #{self_ids}")
 

data/test/has_many_through_belongs_to_test.rb

@@ -0,0 +1,62 @@
+require_relative 'test_helper'
+
+ActiveRecord::Migration.create_table :houses, force: true do |t|
+  t.string :name
+end
+
+ActiveRecord::Migration.create_table :windows, force: true do |t|
+  t.string :name
+  t.integer :house_id
+end
+
+ActiveRecord::Migration.create_table :doors, force: true do |t|
+  t.string :name
+  t.integer :house_id
+end
+
+class House < ActiveRecord::Base
+  has_many :windows
+  has_many :doors
+end
+
+class Window < ActiveRecord::Base
+  belongs_to :house
+  has_many :doors, through: :house
+end
+
+class Door < ActiveRecord::Base
+  belongs_to :house
+end
+
+class HasManyThroughBelongsToTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.descendants.each(&:delete_all)
+  end
+
+  def test_through_belongs_to
+    house = House.create! name: 'relevant'
+    irrelevant_house = House.create! name: 'irrelevant'
+
+    window = Window.create!(house: house)
+    irrelevant_window = Window.create!(house: irrelevant_house)
+
+    door = Door.create!(name: 'relevant', house: house)
+    irrelevant_door = Door.create!(name: 'irrelevant', house: irrelevant_house)
+
+    result = House.where_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal house.id, result.first.id
+
+    result = House.where_not_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal irrelevant_house.id, result.first.id
+
+    result = House.where_not_exists(:doors, "name = ?", 'relevant')
+    assert_equal 1, result.length
+    assert_equal irrelevant_house.id, result.first.id
+
+    result = Window.where_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal window.id, result.first.id
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,17 +114,19 @@ files:
 - lib/where_exists/version.rb
 - test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
+- test/db/test.db
 - test/documentation_test.rb
 - test/has_and_belongs_to_many.rb
 - test/has_many_polymorphic_test.rb
 - test/has_many_test.rb
+- test/has_many_through_belongs_to_test.rb
 - test/has_many_through_test.rb
 - test/test_helper.rb
 homepage: http://github.com/eugzol/where_exists
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,16 +141,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"
 test_files:
+- test/documentation_test.rb
 - test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
-- test/documentation_test.rb
-- test/has_and_belongs_to_many.rb
 - test/has_many_polymorphic_test.rb
-- test/has_many_test.rb
+- test/db/test.db
 - test/has_many_through_test.rb
 - test/test_helper.rb
+- test/has_many_through_belongs_to_test.rb
+- test/has_and_belongs_to_many.rb
+- test/has_many_test.rb