composite_primary_keys 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec792a1a934ab5a71880968f63579a5f4558ee3c
-  data.tar.gz: b253ff76697c55e458afdb2fff11d12356cf008d
+  metadata.gz: 747335fa1b0ec3dec3bf8747c73154e7315b3adf
+  data.tar.gz: 4717b2d1fa29a60085a1a7555775acbd330aa700
 SHA512:
-  metadata.gz: bd9b2cfd6098aa20094306f7605bfce2332834e97a4b50c073d124d6a1bee19ded28854a8ea27e3ff2f50ae1745bf2e320fafd54fd6d70c4a8b9fa9643017779
-  data.tar.gz: 350b8a33f062bef98f21e419ed229124705d2ccca8303c47ada9528cd8522d691d1af138c7534e49fe869c317810249b2c3c24aa138cf110dbf1cae401595764
+  metadata.gz: c692686ba13178d1965f53d37aa40fa10cabe399312b1281a1834d4f8b9f4c971e984daffbb89836779946d499f4648e73b665bc9a99060e27b6413ee99494c0
+  data.tar.gz: 4bfc14d692903f6f9c00c13c2522e84900c860b457011c11f9210a7d11f8b0285bb285e21bb437510fd320897cc56a3f1cadbcffbd8f4b2021777765f0ffb6fd

data/History.rdoc

@@ -1,3 +1,9 @@
+== 10.0.2 (2017-12-02)
+
+* Fix frozen string mutation for mysql (Sergey Sein)
+* Fix autosave for belongs_to associations (Fabian Mersch)
+* Require a minimum of activerecord version 5.1.4 (Charlie Savage)
+
 == 10.0.1 (2017-10-08)
 
 * Fixed an error that happened when a table attribute had the same name as the table (Taishi Kasuga)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>5.1.0'
+  gem 'activerecord', ['~>5.1.0', '>= 5.1.4']
   require 'active_record'
 end
 
@@ -38,6 +38,7 @@ require 'active_record/persistence'
 require 'active_record/relation'
 require 'active_record/sanitization'
 require 'active_record/attribute_methods'
+require 'active_record/autosave_association'
 
 require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
@@ -78,6 +79,7 @@ require 'composite_primary_keys/relation'
 require 'composite_primary_keys/sanitization'
 require 'composite_primary_keys/attribute_set/builder'
 require 'composite_primary_keys/attribute_methods'
+require 'composite_primary_keys/autosave_association'
 require 'composite_primary_keys/version'
 
 require 'composite_primary_keys/associations/association'

data/lib/composite_primary_keys/autosave_association.rb

@@ -0,0 +1,32 @@
+module ActiveRecord
+  module AutosaveAssociation
+    private
+
+    def save_belongs_to_association(reflection)
+      association = association_instance_get(reflection.name)
+      return unless association && association.loaded? && !association.stale_target?
+
+      record = 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?
+            # CPK
+            # association_id = record.send(reflection.options[:primary_key] || :id)
+            association_id = reflection.options[:primary_key] ? record[reflection.options[:primary_key]] : record.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/sqlserver_adapter.rb

@@ -7,7 +7,7 @@ module ActiveRecord
           # quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
           # sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
           quoted_pks = [pk].flatten.map {|pk| "INSERTED.#{SQLServer::Utils.extract_identifiers(pk).quoted}"}
-          sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT #{quoted_pks.join(", ")}"
+          sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT #{quoted_pks.join(", ")}"
         else
           "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
         end

data/lib/composite_primary_keys/version.rb

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

data/test/test_associations.rb

@@ -71,6 +71,16 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, tariffs.inject(0) {|sum, tariff| sum + tariff.product_tariffs.length})
   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_is_not_cached_to_where_it_returns_the_wrong_one
     engineering = departments(:engineering)
     engineering_head = engineering.head

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +113,7 @@ 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