where_exists 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6f042ea66ced8e828fa202fe84705b55846641
-  data.tar.gz: b28d7eaf45be811108a93108355ce05c2ca5f2d4
+  metadata.gz: 5779b5deb8c1a1c9bcc4685a636f537a0771352a
+  data.tar.gz: 40e44d5113bd916717ac8d2e2e8aa9a8c621075d
 SHA512:
-  metadata.gz: bc5ccf9d5987400e2533b60bbef83b5643a23f7e2780b1e8db83546f2838eb239fb43bb3e1f9ae7e4738255d390a21f25ea989c1cf1afa88fc72b0483ae25baa
-  data.tar.gz: 96255b728f3de38c8d48298eac8a6eb53b78550eb985cc37ccb3f9d93b31ea68f86171a89708b9f6a59260bd2bf22b9e0c43f29969c20e3ccf91114f4b190483
+  metadata.gz: a00a2b3f908457473c4347071d19e83c0f7e0b258ee3355ef02b3f07801a066382de7cb4b58d878eaee257a480b1589f0703041804cb61490443d135765ca35a
+  data.tar.gz: b00c7dc5fed3bef71965296ad320a81d8d12d9f161d6cd2e4b8d98ccf72bdb659e146e31da74fc0c3c70dfb15cb3dc90eb293d78b849466993272071980ebc13

data/lib/where_exists.rb

@@ -55,7 +55,8 @@ module WhereExists
     self_type = quote_table_and_column_name(self.table_name, association.foreign_type)
 
     associated_models.each do |associated_model|
-      other_ids = quote_table_and_column_name(associated_model.table_name, associated_model.primary_key)
+      primary_key = association.options[:primary_key] || associated_model.primary_key
+      other_ids = quote_table_and_column_name(associated_model.table_name, primary_key)
       query = associated_model.select("1").where("#{self_ids} = #{other_ids}").where(where_parameters)
       if polymorphic
         other_type = connection.quote(associated_model.name)
@@ -76,8 +77,9 @@ module WhereExists
     end
 
     associated_model = association.klass
+    primary_key = association.options[:primary_key] || self.primary_key
 
-    self_ids = quote_table_and_column_name(self.table_name, self.primary_key)
+    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)
 
     result = associated_model.select("1").where("#{associated_ids} = #{self_ids}")

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/belongs_to_test.rb

@@ -2,19 +2,20 @@ require 'test_helper'
 
 ActiveRecord::Migration.create_table :simple_entities, :force => true do |t|
   t.string :name
+  t.integer :my_id
 end
 
 ActiveRecord::Migration.create_table :simple_entity_children, :force => true do |t|
-  t.integer :simple_entity_id
+  t.integer :parent_id
   t.string :name
 end
 
 class SimpleEntity < ActiveRecord::Base
-  has_many :simple_entity_children
+  has_many :simple_entity_children, primary_key: :my_id, foreign_key: :parent_id
 end
 
 class SimpleEntityChild < ActiveRecord::Base
-  belongs_to :simple_entity
+  belongs_to :simple_entity, foreign_key: :parent_id, primary_key: :my_id
 end
 
 class BelongsToTest < Minitest::Unit::TestCase
@@ -23,10 +24,10 @@ class BelongsToTest < Minitest::Unit::TestCase
   end
 
   def test_nil_foreign_key
-    entity = SimpleEntity.create!
+    entity = SimpleEntity.create!(my_id: 999)
 
-    child = SimpleEntityChild.create!(simple_entity_id: entity.id)
-    orphaned_child = SimpleEntityChild.create!(simple_entity_id: nil)
+    child = SimpleEntityChild.create!(parent_id: 999)
+    orphaned_child = SimpleEntityChild.create!(parent_id: nil)
 
     result = SimpleEntityChild.where_exists(:simple_entity)
 
@@ -35,10 +36,10 @@ class BelongsToTest < Minitest::Unit::TestCase
   end
 
   def test_not_existing_foreign_object
-    entity = SimpleEntity.create!
+    entity = SimpleEntity.create!(my_id: 999)
 
-    child = SimpleEntityChild.create!(simple_entity_id: entity.id)
-    orphaned_child = SimpleEntityChild.create!(simple_entity_id: entity.id + 1)
+    child = SimpleEntityChild.create!(parent_id: 999)
+    orphaned_child = SimpleEntityChild.create!(parent_id: 500)
 
     result = SimpleEntityChild.where_exists(:simple_entity)
 

data/test/has_many_test.rb

@@ -2,19 +2,20 @@ require 'test_helper'
 
 ActiveRecord::Migration.create_table :simple_entities, :force => true do |t|
   t.string :name
+  t.integer :my_id
 end
 
 ActiveRecord::Migration.create_table :simple_entity_children, :force => true do |t|
-  t.integer :simple_entity_id
+  t.integer :parent_id
   t.string :name
 end
 
 class SimpleEntity < ActiveRecord::Base
-  has_many :simple_entity_children
+  has_many :simple_entity_children, primary_key: :my_id, foreign_key: :parent_id
 end
 
 class SimpleEntityChild < ActiveRecord::Base
-  belongs_to :simple_entity
+  belongs_to :simple_entity, foreign_key: :parent_id
 end
 
 class HasManyTest < Minitest::Unit::TestCase
@@ -25,8 +26,8 @@ class HasManyTest < Minitest::Unit::TestCase
   def test_without_parameters
     child = SimpleEntityChild.create!
 
-    blank_entity = SimpleEntity.create!
-    filled_entity = SimpleEntity.create!(simple_entity_children: [child])
+    blank_entity = SimpleEntity.create!(my_id: 999)
+    filled_entity = SimpleEntity.create!(simple_entity_children: [child], my_id: 500)
 
     result = SimpleEntity.where_exists(:simple_entity_children)
 
@@ -38,9 +39,9 @@ class HasManyTest < Minitest::Unit::TestCase
     wrong_child = SimpleEntityChild.create!(name: 'wrong')
     child = SimpleEntityChild.create!(name: 'right')
 
-    blank_entity = SimpleEntity.create!
-    wrong_entity = SimpleEntity.create!(simple_entity_children: [wrong_child])
-    entity = SimpleEntity.create!(name: 'this field is irrelevant', simple_entity_children: [child])
+    blank_entity = SimpleEntity.create!(my_id: 999)
+    wrong_entity = SimpleEntity.create!(simple_entity_children: [wrong_child], my_id: 500)
+    entity = SimpleEntity.create!(name: 'this field is irrelevant', simple_entity_children: [child], my_id: 300)
 
     result = SimpleEntity.where_exists(:simple_entity_children, name: 'right')
 
@@ -50,7 +51,7 @@ class HasManyTest < Minitest::Unit::TestCase
 
   def test_with_scope
     child = SimpleEntityChild.create!
-    entity = SimpleEntity.create!(simple_entity_children: [child])
+    entity = SimpleEntity.create!(simple_entity_children: [child], my_id: 999)
 
     result = SimpleEntity.unscoped.where_exists(:simple_entity_children)
 
@@ -61,8 +62,8 @@ class HasManyTest < Minitest::Unit::TestCase
   def test_not_exists
     child = SimpleEntityChild.create!
 
-    blank_entity = SimpleEntity.create!
-    filled_entity = SimpleEntity.create!(simple_entity_children: [child])
+    blank_entity = SimpleEntity.create!(my_id: 999)
+    filled_entity = SimpleEntity.create!(simple_entity_children: [child], my_id: 500)
 
     result = SimpleEntity.where_not_exists(:simple_entity_children)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails