composite_primary_keys 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4248480dc399e7b5855cdcb24c52aa0d316cb84
-  data.tar.gz: 8cf2391613840634669fbfac2d0df07fcc4b89d0
+  metadata.gz: f7253caf1292f03bdcac265e1bdad518994aa19a
+  data.tar.gz: 16b2e5c1fd9f528c04b69f91e5fb613ab22ce9aa
 SHA512:
-  metadata.gz: 55a92a161646aedc85be40fc0832651050962e5c53e941f3d97f0a89ace2fbc9363b1bec30f7115dca9d91409b95389fd1dcabe29cbfbd2768113c60e116d0c4
-  data.tar.gz: cd1df5d88752ae0ea029e4b24239cc1038f8a012951c5859a5c3a23dd8183648b6880cebffcd148424a7789e53509af39ecb9e760b3eaa959f127dd35748392f
+  metadata.gz: fcc63c86117a04c279a555237ab7dc1753f78debb5ef6ad26ce797d6f90d100a6283073e1c7204ab9d1c657275dd40482003644573979d9913397f95d9b803a4
+  data.tar.gz: 4df6e19d983774d48afd8ba36d9b6774929569e9a34f0c91dbca9ffa5d0013fbbbfaf0a392e12d362d9b473605a3797f589c39fb46f6e0d61f1d0463837b3768

data/History.rdoc

@@ -1,3 +1,6 @@
+== 9.0.2 (2016-08-10)
+* Fix delete_all when used with a join (Charlie Savage)
+
 == 9.0.1 (2016-07-27)
 * Create OR predicates in a nicely balanced tree fixing #320 (Nathan Samson)
 

data/lib/composite_primary_keys.rb

@@ -113,3 +113,6 @@ require 'composite_primary_keys/relation/query_methods'
 require 'composite_primary_keys/validations/uniqueness'
 
 require 'composite_primary_keys/composite_relation'
+
+require 'composite_primary_keys/arel/in'
+require 'composite_primary_keys/arel/to_sql'

data/lib/composite_primary_keys/arel/in.rb

@@ -0,0 +1,6 @@
+module CompositePrimaryKeys
+  module Nodes
+    class In < ::Arel::Nodes::Equality
+    end
+  end
+end

data/lib/composite_primary_keys/arel/to_sql.rb

@@ -0,0 +1,26 @@
+module Arel
+  module Visitors
+    class ToSql
+      def visit_CompositePrimaryKeys_Nodes_In o, collector
+        collector << "("
+        visit(o.left, collector)
+        collector << ")"
+        collector << " IN ("
+        visit(o.right, collector) << ")"
+      end
+
+      def visit_CompositePrimaryKeys_CompositeKeys o, collector
+        values = o.map do |key|
+          case key
+            when Arel::Attributes::Attribute
+              "#{key.relation.name}.#{key.name}"
+            else
+              key
+          end
+        end
+        collector << "#{values.join(', ')}"
+        collector
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/composite_arrays.rb

@@ -33,6 +33,14 @@ module CompositePrimaryKeys
       end
     end
 
+    def in(other)
+      case other
+        when Arel::SelectManager
+          CompositePrimaryKeys::Nodes::In.new(self, other.ast)
+      end
+    end
+
+
     def to_s
       # Doing this makes it easier to parse Base#[](attr_name)
       join(ID_SEP)

data/lib/composite_primary_keys/relation.rb

@@ -46,5 +46,48 @@ module ActiveRecord
         )
       end
     end
+
+    def delete_all(conditions = nil)
+      invalid_methods = INVALID_METHODS_FOR_DELETE_ALL.select { |method|
+        if MULTI_VALUE_METHODS.include?(method)
+          send("#{method}_values").any?
+        elsif SINGLE_VALUE_METHODS.include?(method)
+          send("#{method}_value")
+        elsif CLAUSE_METHODS.include?(method)
+          send("#{method}_clause").any?
+        end
+      }
+      if invalid_methods.any?
+        raise ActiveRecordError.new("delete_all doesn't support #{invalid_methods.join(', ')}")
+      end
+
+      if conditions
+        ActiveSupport::Deprecation.warn(<<-MESSAGE.squish)
+          Passing conditions to delete_all is deprecated and will be removed in Rails 5.1.
+          To achieve the same use where(conditions).delete_all.
+        MESSAGE
+        where(conditions).delete_all
+      else
+        stmt = Arel::DeleteManager.new
+        stmt.from(table)
+
+        # CPK
+        if joins_values.any? && @klass.composite?
+          arel_attributes = Array(primary_key).map do |key|
+            arel_attribute(key)
+          end.to_composite_keys
+          @klass.connection.join_to_delete(stmt, arel, arel_attributes)
+        elsif joins_values.any?
+          @klass.connection.join_to_delete(stmt, arel, arel_attribute(primary_key))
+        else
+          stmt.wheres = arel.constraints
+        end
+
+        affected = @klass.connection.delete(stmt, 'SQL', bound_attributes)
+
+        reset
+        affected
+      end
+    end
   end
 end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 9
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_delete.rb

@@ -19,36 +19,49 @@ class TestDelete < ActiveSupport::TestCase
     self.class.classes = CLASSES
   end
 
-  # def test_destroy_one
-  #   testing_with do
-  #     assert @first.destroy
-  #   end
-  # end
-  #
-  # def test_destroy_one_alone_via_class
-  #   testing_with do
-  #     assert @klass.destroy(@first.id)
-  #   end
-  # end
-  #
-  # def test_delete_one_alone
-  #   testing_with do
-  #     assert @klass.delete(@first.id)
-  #   end
-  # end
-  #
-  # def test_delete_many
-  #   testing_with do
-  #     to_delete = @klass.limit(2)
-  #     assert_equal 2, to_delete.length
-  #   end
-  # end
-  #
-  # def test_delete_all
-  #   testing_with do
-  #     @klass.delete_all
-  #   end
-  # end
+  def test_destroy_one
+    testing_with do
+      assert @first.destroy
+    end
+  end
+
+  def test_destroy_one_alone_via_class
+    testing_with do
+      assert @klass.destroy(@first.id)
+    end
+  end
+
+  def test_delete_one_alone
+    testing_with do
+      assert @klass.delete(@first.id)
+    end
+  end
+
+  def test_delete_many
+    testing_with do
+      to_delete = @klass.limit(2)
+      assert_equal 2, to_delete.length
+    end
+  end
+
+  def test_delete_all
+    testing_with do
+      @klass.delete_all
+    end
+  end
+
+  def test_delete_all_with_join
+    department = departments(:accounting)
+
+    assert_equal(4, Department.count)
+
+    Department.joins(:employees).
+               where('departments.department_id = ?',  department.department_id).
+               where('departments.location_id = ?',  department.location_id).
+               delete_all
+
+    assert_equal(3, Department.count)
+  end
 
   def test_clear_association
     department = Department.find([1,1])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,6 +91,8 @@ files:
 - README_DB2.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/arel/in.rb
+- lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/collection_association.rb