composite_primary_keys 8.1.2 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce98265078e9df3388a619400153228e3d060120
-  data.tar.gz: 02bfe6e56836f6a5c6f6e73ca8bcc1af3502a729
+  metadata.gz: 5dcd8c948f14181d3e5ebb97a5a79f124e7e9cef
+  data.tar.gz: 435b1a7ffaf2c481b09b268fd28585112a092f44
 SHA512:
-  metadata.gz: 47e1b2d9385bdc3222d316989aad9c876d218cc985cbf4a11cfa66cf4de0fe67a466891242b8f2b38af96e1a0e2a6d34da7176ff2ca55b5445c2c43c94a46fe5
-  data.tar.gz: e7c96de2cb63e3512f511b9d46a81df2154fe05d4ed7547d65ea101e691f90f484df3f9d8da3aaa269ba5a0054ebac48e92738064d51e5d1e39fb41df9189f69
+  metadata.gz: c38c11665ea24815069cd8c2c14701108cc1516663cba835eb044db3ebcabc26d46dee9db88d9c2c6923d992ee3c0b8293825ca3f2af88411641a1ed0a4bff67
+  data.tar.gz: cd22418296a7ffbd27c5ece78c7bc835be47bd50b4a4ed51c96bea564225fa3ebc9782fb60ba6b02a76d7784074c56c2df82d7d3e443cd7e17053ab8a25b43f9

data/History.rdoc

@@ -1,3 +1,11 @@
+== 8.1.3 (2016-04-16)
+
+* Make CPK work for Arel::Attributes::Attribute (Rick Xing)
+* Change autosave_association.rb so that association autosave can work (Rick Xing)
+* Fix exception when saving "other_ids=" with a has_many :through association where the source
+  association is polymorphic (Tye Shavik)
+* Fix Arel::Nodes::In where left side is not a column (Tye Shavik)
+
 == 8.1.2 (2015-12-13)
 
 * Fix failing tests

data/lib/composite_primary_keys.rb

@@ -61,6 +61,7 @@ require 'active_record/locking/optimistic'
 require 'active_record/nested_attributes'
 
 require 'active_record/connection_adapters/abstract_adapter'
+require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 require 'active_record/relation/batches'
 require 'active_record/relation/calculations'
@@ -97,6 +98,7 @@ require 'composite_primary_keys/associations/singular_association'
 require 'composite_primary_keys/associations/collection_association'
 
 require 'composite_primary_keys/dirty'
+require 'composite_primary_keys/autosave_association'
 
 require 'composite_primary_keys/attribute_methods/primary_key'
 require 'composite_primary_keys/attribute_methods/dirty'
@@ -106,6 +108,7 @@ require 'composite_primary_keys/locking/optimistic'
 require 'composite_primary_keys/nested_attributes'
 
 require 'composite_primary_keys/connection_adapters/abstract_adapter'
+require 'composite_primary_keys/connection_adapters/abstract_mysql_adapter'
 require 'composite_primary_keys/connection_adapters/abstract/connection_specification_changes'
 
 require 'composite_primary_keys/relation/batches'

data/lib/composite_primary_keys/arel/visitors/to_sql.rb

@@ -1,13 +1,25 @@
 module Arel
   module Visitors
     class ToSql
+      def visit_Arel_Attributes_Attribute o, collector
+        join_name = o.relation.table_alias || o.relation.name
+        table_name = quote_table_name join_name
+
+        if o.name.is_a? Array
+          collector <<
+            o.name.map{ |field| "#{table_name}.#{quote_column_name(field)}" }.join(",")
+        else
+          collector << "#{table_name}.#{quote_column_name o.name}"
+        end
+      end
+
       def visit_Arel_Nodes_In o, collector
         if Array === o.right && o.right.empty?
           collector << '1=0'
         else
           # CPK
           # collector = visit o.left, collector
-          if o.left.name.is_a?(Array)
+          if o.left.respond_to?(:name) && o.left.name.is_a?(Array)
             collector << "("
             collector = visit(o.left, collector)
             collector << ")"

data/lib/composite_primary_keys/associations/has_many_through_association.rb

@@ -19,7 +19,8 @@ module ActiveRecord
         scope = through_association.scope
         # CPK
         # scope.where! construct_join_attributes(*records)
-        if source_reflection.klass.composite?
+        source_klass = source_reflection.polymorphic? ? klass : source_reflection.klass
+        if source_klass.composite?
           scope.where! cpk_join_through_predicate(*records)
         else
           scope.where! construct_join_attributes(*records)

data/lib/composite_primary_keys/autosave_association.rb

@@ -0,0 +1,31 @@
+module ActiveRecord
+  module AutosaveAssociation
+    private
+      # Saves the associated record if it's new or <tt>:autosave</tt> is enabled.
+      #
+      # In addition, it will destroy the association if it was marked for destruction.
+      def save_belongs_to_association(reflection)
+        association = association_instance_get(reflection.name)
+        record      = association && association.load_target
+        if record && !record.destroyed?
+          autosave = reflection.options[:autosave]
+
+          if autosave && record.marked_for_destruction?
+            self[reflection.foreign_key] = nil
+            record.destroy
+          elsif autosave != false
+            saved = record.save(:validate => !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
+
+            if association.updated?
+              # it will fail to use "#record.send(reflection.options[:primary_key] || :id)" for CPK
+              association_id = record.read_attribute(reflection.options[:primary_key] || :id)
+              self[reflection.foreign_key] = association_id
+              association.loaded!
+            end
+
+            saved if autosave
+          end
+        end
+      end
+  end
+end

data/lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb

@@ -0,0 +1,23 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter < AbstractAdapter
+      # MySQL is too stupid to create a temporary table for use subquery, so we have
+      # to give it some prompting in the form of a subsubquery. Ugh!
+      def subquery_for(key, select)
+        subsubselect = select.clone
+        subsubselect.projections = [key]
+
+        # Materialize subquery by adding distinct
+        # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
+        subsubselect.distinct unless select.limit || select.offset || select.orders.any?
+
+        subselect = Arel::SelectManager.new(select.engine)
+
+        # subselect.project Arel.sql(key.name)
+        arel_table = select.engine.arel_table
+        subselect.project *key.name.map{|x| arel_table[x]}
+        subselect.from subsubselect.as('__active_record_temp')
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/user.rb

@@ -1,10 +1,11 @@
-class User < ActiveRecord::Base
-  has_many :readings
-  has_many :articles, :through => :readings
-  has_many :comments, :as => :person
-  has_many :hacks, :through => :comments, :source => :hack
-  
-  def find_custom_articles
-    articles.where("name = ?", "Article One")
-  end
-end
+class User < ActiveRecord::Base
+  has_many :readings
+  has_many :articles, :through => :readings
+  has_many :comments, :as => :person
+  has_many :hacks, :through => :comments, :source => :hack
+  has_many :persons, :through => :comments, :source_type => 'User'
+  
+  def find_custom_articles
+    articles.where("name = ?", "Article One")
+  end
+end

data/test/test_associations.rb

@@ -81,6 +81,16 @@ class TestAssociations < ActiveSupport::TestCase
     refute_equal accounting_head, engineering_head
   end
 
+  def test_association_with_composite_primary_key_can_be_autosaved
+    room = Room.new(dorm_id: 1000, room_id: 1001)
+    room_assignment = RoomAssignment.new(student_id: 1000)
+    room_assignment.room = room
+    room_assignment.save
+    room_assignment.reload
+    assert_equal(room_assignment.dorm_id, 1000)
+    assert_equal(room_assignment.room_id, 1001)
+  end
+
   def test_has_one_association_primary_key_and_foreign_key_are_present
     steve = employees(:steve)
     steve_salary = steve.create_one_salary(year: "2015", month: "1")

data/test/test_delete_all.rb

@@ -27,8 +27,9 @@ class TestValidations < ActiveSupport::TestCase
     assert(EmployeesGroup.all.size == 3)
   end
 
-  # This test fails, requires fixin arel
   def test_delete_all_with_joins
-    ReferenceCode.joins(:reference_type).where(:reference_type_id => 1).delete_all
+    # Let's ignore SQLite for this case since multi-column IN clause like (column1, column2) IN (...) is not allowed.
+    # It cannot work without some dirty fix.
+    ReferenceCode.joins(:reference_type).where(:reference_type_id => 1).delete_all unless ReferenceCode.connection.adapter_name == "SQLite"
   end
 end

data/test/test_polymorphic.rb

@@ -24,4 +24,11 @@ class TestPolymorphic < ActiveSupport::TestCase
     user = users(:santiago)
     assert_equal(['andrew'], user.hacks.collect { |a| a.name }.sort)
   end
+  
+  def test_has_many_through_with_polymorphic_source
+    user = users(:santiago)
+    user_to_associate = users(:drnic)
+    user.update_attributes :persons => [user_to_associate]
+    assert_equal user.persons, [user_to_associate]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.1.2
+  version: 8.1.3
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,12 +94,14 @@ files:
 - lib/composite_primary_keys/attribute_methods/read.rb
 - lib/composite_primary_keys/attribute_methods/write.rb
 - lib/composite_primary_keys/attribute_set/builder.rb
+- lib/composite_primary_keys/autosave_association.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
+- lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
 - lib/composite_primary_keys/core.rb
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord