where_exists 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b896dc7f4e36987c9fee2d3f99624944241c5778
-  data.tar.gz: 3b63cf040cc3eccc90b22ffb167815cbc6c26762
+  metadata.gz: '09bda87b615e0962be005bda294cc0227e1d76ce'
+  data.tar.gz: 4cb809c77b97dfaad246f1a90be28e75cc2bb5a2
 SHA512:
-  metadata.gz: f41ff3048e44820bd889403986a48ad90f95e1b3c97b0cfcd43a5797b2c5fdf706b8c6ac21ff3c9655489610a1ec38675001fd10ad5452237b0d46862f02660b
-  data.tar.gz: 744a933a1fcc1fc3bd5251fc1b686c3009d4b7894996a64bef294947d18ed283552b00a225213d3181ae9e8768f976fede2a26aec03c05e6910a35407c7d9003
+  metadata.gz: b4ca719701af78dfc661a35cb815adf49d1206072f0fa3db2af6a411677f7394ad19547706f0f14265462955231847922821732caa9c64ca4e22186cefeb1127
+  data.tar.gz: 6e147f5238c544d0691cfb982d38cc560b5baf6a97d82f5529b94cafed6683c9e1a0b7706b6d967e2cc0913b905906c0d3192d64e064407f60774cd6c309f94c

data/lib/where_exists.rb

@@ -23,8 +23,16 @@ module WhereExists
       queries = where_exists_for_belongs_to_query(association, where_parameters)
     when :has_many, :has_one
       queries = where_exists_for_has_many_query(association, where_parameters)
+    when :has_and_belongs_to_many
+      queries = where_exists_for_habtm_query(association, where_parameters)
     else
-      raise ArgumentError.new("where_exists: not supported association – #{association.macros.inspect}")
+      inspection = nil
+      begin
+        inspection = association.macros.inspect
+      rescue
+        inspection = association.macro
+      end
+      raise ArgumentError.new("where_exists: not supported association – #{inspection}")
     end
 
     if does_exist
@@ -33,7 +41,7 @@ module WhereExists
       not_string = "NOT "
     end
 
-    queries_sql = queries.map{|query| "EXISTS (" + query.to_sql + ")"}.join(" OR ")
+    queries_sql = queries.map { |query| "EXISTS (" + query.to_sql + ")" }.join(" OR ")
 
     self.where("#{not_string}(#{queries_sql})")
   end
@@ -62,7 +70,7 @@ module WhereExists
         query = query.where(*where_parameters)
       end
       if association_scope
-        result = result.instance_exec(&association_scope)
+        query = query.instance_exec(&association_scope)
       end
       if polymorphic
         other_type = connection.quote(associated_model.name)
@@ -92,10 +100,6 @@ module WhereExists
 
     result = associated_model.select("1").where("#{associated_ids} = #{self_ids}")
 
-    if association_scope
-      result = result.instance_exec(&association_scope)
-    end
-
     if association.options[:as]
       other_types = quote_table_and_column_name(associated_model.table_name, association.type)
       self_class = connection.quote(self.name)
@@ -103,11 +107,49 @@ module WhereExists
     end
 
     if through
-      result = result.where_exists(next_association.name, *where_parameters)
-    else
-      if where_parameters != []
-        result = result.where(*where_parameters)
-      end
+      return [result.where_exists(next_association.name, *where_parameters)]
+    end
+
+    if where_parameters != []
+      result = result.where(*where_parameters)
+    end
+    if association_scope
+      result = result.instance_exec(&association_scope)
+    end
+
+    [result]
+  end
+
+  def where_exists_for_habtm_query(association, where_parameters)
+    association_scope = association.scope
+
+    associated_model = association.klass
+
+    primary_key = association.options[:primary_key] || self.primary_key
+
+    join_table = [self.table_name, associated_model.table_name].sort.join("_")
+
+    self_ids = quote_table_and_column_name(self.table_name, primary_key)
+    join_ids = quote_table_and_column_name(join_table, association.foreign_key)
+    associated_join_ids = quote_table_and_column_name(join_table, "#{associated_model.name.downcase}_id")
+    associated_ids = quote_table_and_column_name(associated_model.table_name, associated_model.primary_key)
+
+    result =
+      associated_model.
+      select("1").
+      joins(
+        <<-SQL
+          INNER JOIN #{connection.quote_table_name(join_table)}
+          ON #{associated_ids} = #{associated_join_ids}
+        SQL
+      ).
+      where("#{join_ids} = #{self_ids}")
+
+    if where_parameters != []
+      result = result.where(*where_parameters)
+    end
+    if association_scope
+      result = result.instance_exec(&association_scope)
     end
 
     [result]

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/has_and_belongs_to_many.rb

@@ -0,0 +1,92 @@
+require 'test_helper'
+
+ActiveRecord::Migration.create_table :tasks, :force => true do |t|
+  t.string :name
+end
+
+ActiveRecord::Migration.create_table :invoices_tasks, :force => true do |t|
+  t.integer :invoice_id
+  t.integer :task_id
+end
+
+ActiveRecord::Migration.create_table :invoices, :force => true do |t|
+  t.string :name
+end
+
+class Task < ActiveRecord::Base
+  has_and_belongs_to_many :connected_invoices, class_name: 'Invoice'
+end
+
+class Invoice < ActiveRecord::Base
+  has_and_belongs_to_many :tasks
+  has_and_belongs_to_many :unnamed_tasks, -> { where(name: nil) }
+end
+
+# Invoices ->  LineItems <- Tasks <- Project
+
+class HasAndBelongsToManyTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.descendants.each(&:delete_all)
+  end
+
+  def test_with_standard_naming
+    task = Task.create!(name: 'task')
+    irrelevant_task = Task.create!(name: 'task_2')
+    invoice = Invoice.create!(name: 'invoice')
+    invoice_no_join = Invoice.create!(name: 'invoice_2')
+
+    invoice.tasks << task
+
+
+    result = Invoice.where_exists(:tasks, name: 'task')
+
+    assert_equal 1, result.length
+    assert_equal invoice.id, result.first.id
+
+    result = Invoice.where_exists(:tasks, name: 'task_2')
+
+    assert_equal 0, result.length
+
+    result = Invoice.where_not_exists(:tasks)
+    assert_equal 1, result.length
+    assert_equal invoice_no_join.id, result.first.id
+  end
+
+  def test_with_custom_naming
+    task = Task.create!(name: 'task')
+    task_no_join = Task.create!(name: 'invoice')
+    invoice = Invoice.create!(name: 'invoice')
+    irrelevant_invoice = Invoice.create!(name: 'invoice_2')
+
+    task.connected_invoices << invoice
+
+    result = Task.where_exists(:connected_invoices, name: 'invoice')
+
+    assert_equal 1, result.length
+    assert_equal task.id, result.first.id
+
+    result = Task.where_exists(:connected_invoices, name: 'invoice_2')
+
+    assert_equal 0, result.length
+
+    result = Task.where_not_exists(:connected_invoices)
+    assert_equal 1, result.length
+    assert_equal task_no_join.id, result.first.id
+
+    result = Task.where_not_exists(:connected_invoices, name: 'invoice_2')
+    assert_equal 2, result.length
+  end
+
+  def test_with_condition
+    task_1 = Task.create! name: nil
+    task_2 = Task.create! name: 'task 2'
+
+    invoice_1 = Invoice.create!(tasks: [task_1])
+    invoice_2 = Invoice.create!(tasks: [task_1, task_2])
+    invoice_3 = Invoice.create!(tasks: [task_2)
+
+    result_ids = Invoice.where_exists(:unnamed_tasks).pluck(:id)
+
+    assert_equal [invoice_1.id, invoice_2.id].sort, result_ids.sort
+  end
+end

data/test/has_many_through_test.rb

@@ -91,5 +91,10 @@ class HasManyThroughTest < Minitest::Test
 
     assert_equal 1, result.length
     assert_equal irrelevant_project.id, result.first.id
+
+    result = Project.where_not_exists(:invoices, "name = ?", 'relevant')
+
+    assert_equal 1, result.length
+    assert_equal irrelevant_project.id, result.first.id
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Eugene Zolotarev
@@ -73,6 +73,7 @@ files:
 - 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_test.rb
@@ -107,6 +108,7 @@ test_files:
 - test/documentation_test.rb
 - test/test_helper.rb
 - test/has_many_polymorphic_test.rb
+- test/has_and_belongs_to_many.rb
 - test/belongs_to_polymorphic_test.rb
 - test/has_many_test.rb
 - test/has_many_through_test.rb