composite_primary_keys 7.0.12 → 7.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cb7db711192f8ae6b531e8c5cc5fa316554806
-  data.tar.gz: ce079278064acfc94b691592c804047c6b0a4dd5
+  metadata.gz: 11bd0689a2d8973f43dc85cb073ad159ff3bf928
+  data.tar.gz: f522a924cbcf3133266412edbc199578d04de126
 SHA512:
-  metadata.gz: f927ff29273325bc1034c2981382403fc568709f6f400db40e9d33c0933dc2016b222a9ae67cc85ad414b1e8b0e5186441ca534039f9c61c0bf35fe27c87c284
-  data.tar.gz: c0f88b9953c629c61b2bb001b0ff9375878c196b9b13f6d60e92705514ff04971b5a5ed4add442c55eebd169aded609f159d5a30ee0bd326a4b370f1d595a787
+  metadata.gz: 35ab53ffeda373c7cbd67e9b44aa59176bda538d02be516e10d5d8aca2e36ebf96f56458c318689df792672cd06dcc3110057bcc8eb3fe2a1673705b13649679
+  data.tar.gz: 85cf61a48776def558c3ac4ec34f59402faa00979552dc6e64bd46fdd0f0712955ce5e83761422f656174a5894a7eb622efb8fc1d3037afe46b365a3e41288c1

data/History.rdoc

@@ -1,3 +1,9 @@
+== 7.0.13 (2015-01-24)
+
+* Support optimistic lock and lock_version added to existing fixtures (Kirika)
+* README change to convey finding available versions (Aaron Bartell)
+* Fixes indentation in product_tariffs (Zaldabus)
+
 == 7.0.12 (2014-11-09)
 
 * ActiveRecord 4.1.7 support (Tom Hughes)
@@ -84,6 +90,12 @@ The first one no longer works.  It was removed because it made the internal code
 and makes the intention of the code clearer (especially when finding multiple records).
 If this change causes too much pain then please submit a ticket on Github.
 
+== 6.0.08 (2015-01-24)
+
+* Fix habtm association #delete_records (Uros Jurglic)
+* Support optimistic locking (Toshio Maki)
+* Remove singleton classes on CPK relations (Nicolás Hock Isaza)
+
 == 6.0.7 (2014-10-06)
 
 * Support Rails 4.0.6 (Tom Hughes)

data/README.rdoc

@@ -25,6 +25,10 @@ things straight, here is the mapping:
     Version 5.x is designed to work with ActiveRecord 3.2.x
     Version 4.x is designed to work with ActiveRecord 3.1.x
 
+Run the following command to list available versions:
+
+    gem list composite_primary_keys -ra
+
 == The basics
 
 A model with composite primary keys is defined like this:

data/lib/composite_primary_keys.rb

@@ -52,6 +52,7 @@ require 'active_record/attribute_methods/primary_key'
 require 'active_record/attribute_methods/dirty'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
+require 'active_record/locking/optimistic'
 require 'active_record/nested_attributes'
 
 require 'active_record/connection_adapters/abstract_adapter'
@@ -92,6 +93,7 @@ require 'composite_primary_keys/attribute_methods/primary_key'
 require 'composite_primary_keys/attribute_methods/dirty'
 require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'
+require 'composite_primary_keys/locking/optimistic'
 require 'composite_primary_keys/nested_attributes'
 
 require 'composite_primary_keys/connection_adapters/abstract_adapter'

data/lib/composite_primary_keys/locking/optimistic.rb

@@ -0,0 +1,55 @@
+  module ActiveRecord
+    module Locking
+      module Optimistic
+        private
+          def _update_record(attribute_names = @attributes.keys) #:nodoc:
+            return super unless locking_enabled?
+            return 0 if attribute_names.empty?
+
+            lock_col = self.class.locking_column
+            previous_lock_value = send(lock_col).to_i
+            increment_lock
+
+            attribute_names += [lock_col]
+            attribute_names.uniq!
+
+            begin
+              relation = self.class.unscoped
+
+              if self.composite?
+                stmt = relation.where(
+                  relation.cpk_id_predicate(relation.table, self.class.primary_key, id_was).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(
+                  arel_attributes_with_values_for_update(attribute_names),
+                  self.class.primary_key
+                )
+              else
+                stmt = relation.where(
+                  relation.table[self.class.primary_key].eq(id).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(
+                  arel_attributes_with_values_for_update(attribute_names),
+                  self.class.primary_key
+                )
+              end
+
+              affected_rows = self.class.connection.update stmt
+
+              unless affected_rows == 1
+                raise ActiveRecord::StaleObjectError.new(self, "update")
+              end
+
+              affected_rows
+
+            # If something went wrong, revert the version.
+            rescue Exception
+              send(lock_col + '=', previous_lock_value)
+              raise
+            end
+          end
+      end
+    end
+  end

data/lib/composite_primary_keys/nested_attributes.rb

@@ -51,7 +51,6 @@ module ActiveRecord
 
       attributes_collection.each do |attributes|
         attributes = attributes.with_indifferent_access
-
         if attributes['id'].blank?
           unless reject_new_record?(association_name, attributes)
             association.build(attributes.except(*UNASSIGNABLE_KEYS))
@@ -62,6 +61,7 @@ module ActiveRecord
             # proxy_target array (either by finding it, or adding it if not found)
             # Take into account that the proxy_target may have changed due to callbacks
             target_record = cpk_detect_record(attributes['id'], association.target)
+
             if target_record
               existing_record = target_record
             else

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -1,3 +1,17 @@
+CREATE TABLE topics (
+  id integer NOT NULL,  
+  name varchar(50) default NULL,  
+  feed_size integer default NULL, 
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE topic_sources (
+  topic_id integer NOT NULL,
+  platform varchar(50) NOT NULL,
+  keywords varchar(50) default NULL,
+  PRIMARY KEY (topic_id,platform)
+);
+
 CREATE TABLE reference_types (
   reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
   type_label varchar(50) default NULL,  
@@ -94,6 +108,7 @@ create table restaurants (
 	franchise_id integer not null,
 	store_id integer not null,
 	name varchar(100),
+  lock_version integer default 0,
 	primary key (franchise_id, store_id)
 );
 

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -15,3 +15,5 @@ drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
 drop table PRODUCTS_RESTAURANTS;
+drop table TOPICS;
+drop table TOPIC_SOURCES;

data/test/fixtures/db_definitions/mysql.sql

@@ -1,3 +1,17 @@
+create table topics (
+    id int not null auto_increment,  
+    name varchar(50) default null,  
+    feed_size int default null, 
+    primary key (id)
+);
+
+create table topic_sources (
+    topic_id int not null,
+    platform varchar(50) not null,
+    keywords varchar(50) default null,
+    primary key (topic_id,platform)
+);
+
 create table reference_types (
     reference_type_id int not null auto_increment,
     type_label varchar(50) default null,
@@ -124,6 +138,7 @@ create table restaurants (
     franchise_id int not null,
     store_id int not null,
     name varchar(100),
+    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -1,3 +1,6 @@
+drop table topics;
+drop sequence topics_seq;
+drop table topic_sources;
 drop table reference_types;
 drop sequence reference_types_seq;
 drop table reference_codes;

data/test/fixtures/db_definitions/oracle.sql

@@ -1,3 +1,17 @@
+create sequence topics_seq start with 1000;
+
+create table topics (
+    id          number(11)  primary key,
+    name        varchar(50) default null,  
+    feed_size   number(11)  default null,
+);
+
+create table topic_sources (
+    topic_id number(11),
+    platform varchar(50),
+    keywords varchar(50) default null,
+);
+
 create sequence reference_types_seq start with 1000;
 
 create table reference_types (
@@ -132,6 +146,7 @@ create table restaurants (
     franchise_id number(11) not null,
     store_id     number(11) not null,
     name         varchar(100),
+    lock_version number(11) default 0,
     constraint restaurants_pk primary key (franchise_id, store_id)
 );
 

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,3 +1,17 @@
+create table topics (
+    id          serial not null,
+    name        varchar(50) default null,  
+    feed_size   int default null, 
+    primary key (id)
+);
+
+create table topic_sources (
+    topic_id int         not null,
+    platform varchar(50) not null,
+    keywords varchar(50) default null,
+    primary key (topic_id,platform)
+);
+
 create table reference_types (
     reference_type_id serial not null,
     type_label        varchar(50) default null,
@@ -126,6 +140,7 @@ create table restaurants (
     franchise_id int not null,
     store_id     int not null,
     name         varchar(100),
+    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 

data/test/fixtures/db_definitions/sqlite.sql

@@ -1,3 +1,17 @@
+create table topics (
+    id int not null,  
+    name varchar(50) default null,  
+    feed_size int default null, 
+    primary key (id)
+);
+
+create table topic_sources (
+    topic_id int not null,
+    platform varchar(50) not null,
+    keywords varchar(50) default null,
+    primary key (topic_id,platform)
+);
+
 create table reference_types (
     reference_type_id integer primary key,
     type_label varchar(50) default null,
@@ -115,6 +129,7 @@ create table restaurants (
 	franchise_id integer not null,
 	store_id integer not null,
 	name varchar(100),
+  lock_version integer default 0,
 	primary key (franchise_id, store_id)
 );
 

data/test/fixtures/db_definitions/sqlserver.drop.sql

@@ -1,6 +1,12 @@
 USE [composite_primary_keys_unittest];
 go
 
+DROP TABLE topics;
+go
+
+DROP TABLE topic_sources;
+go
+
 DROP TABLE reference_types;
 go
 

data/test/fixtures/db_definitions/sqlserver.sql

@@ -1,6 +1,20 @@
 USE [composite_primary_keys_unittest];
 go
 
+CREATE TABLE topics (
+    id          [int] IDENTITY(1000,1) NOT NULL,  
+    name        [varchar](50) default NULL,  
+    feed_size   [int] default NULL
+);
+go
+
+CREATE TABLE topic_sources (
+    topic_id    [int] NOT NULL,
+    platform    [varchar](50) NOT NULL,
+    keywords    [varchar](50) default NULL,
+);
+go
+
 CREATE TABLE reference_types (
     reference_type_id [int] IDENTITY(1000,1) NOT NULL,
     type_label        [varchar](50) NULL,
@@ -134,7 +148,8 @@ go
 CREATE TABLE restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL,
-    name         [varchar](100)
+    name         [varchar](100),
+    lock_version [int] DEFAULT 0
     CONSTRAINT [restaurants_pk] PRIMARY KEY CLUSTERED 
         ( [franchise_id], [store_id] )
 );
@@ -208,4 +223,4 @@ CREATE TABLE products_restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL
 );
-go
+go

data/test/fixtures/product_tariffs.yml

@@ -3,11 +3,11 @@ first_flat:
   tariff_id: 1
   tariff_start_date: <%= Date.today.to_s(:db) %>
 
-first_free:  
+first_free:
   product_id: 1
   tariff_id: 2
   tariff_start_date: <%= Date.today.to_s(:db) %>
-  
+
 second_free:
   product_id: 2
   tariff_id: 2

data/test/fixtures/reference_code.rb

@@ -1,7 +1,7 @@
 class ReferenceCode < ActiveRecord::Base
   self.primary_keys = :reference_type_id, :reference_code
-  
+
   belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
+
   validates_presence_of :reference_code, :code_label, :abbreviation
 end

data/test/fixtures/topic.rb

@@ -0,0 +1,6 @@
+class Topic < ActiveRecord::Base
+	has_many :topic_sources, dependent: :destroy
+	accepts_nested_attributes_for :topic_sources
+
+	validates :name, :feed_size, presence: true
+end

data/test/fixtures/topic_source.rb

@@ -0,0 +1,7 @@
+class TopicSource < ActiveRecord::Base
+	self.primary_keys = :topic_id, :platform
+
+	belongs_to :topic, inverse_of: :topic_sources
+
+	validates :platform, presence: true
+end

data/test/fixtures/topic_sources.yml

@@ -0,0 +1,4 @@
+music_source:
+  topic_id: 1
+  platform: 'twitter'
+  keywords: 'classical'

data/test/fixtures/topics.yml

@@ -0,0 +1,9 @@
+music:
+  id: 1
+  name: Guitar
+  feed_size: 500
+
+iphone:
+  id: 2
+  name: iPhone
+  feed_size: 500

data/test/test_nested_attributes.rb

@@ -33,6 +33,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
       :code_label => 'AAA',
       :abbreviation => 'Aaa'
     }]
+
     reference_code = ReferenceCode.find_by_reference_code(code_id)
     assert_kind_of(ReferenceCode, reference_code)
     assert_equal(reference_code.code_label, 'AAA')
@@ -63,4 +64,61 @@ class TestNestedAttributes < ActiveSupport::TestCase
     assert_equal(reference_code.code_label, 'XX')
     assert_equal(reference_code.abbreviation, 'Xx')
   end
+
+  fixtures :topics, :topic_sources
+
+  def test_nested_attributes_create_with_string_in_primary_key
+    platform = 'instagram'
+
+    topic = topics(:music)
+    topic.update_attribute :topic_sources_attributes, [{
+      :platform => platform,
+      :keywords => 'funk'
+    }]
+    assert_not_nil TopicSource.find_by_platform(platform)
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key
+    platform = 'instagram'
+
+    topic = topics(:music)
+    topic.update_attribute :topic_sources_attributes, [{
+      :platform => platform,
+      :keywords => 'funk'
+    }]
+    assert_not_nil TopicSource.find_by_platform(platform)
+
+    topic_source = TopicSource.find_by_platform(platform)
+    cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
+    topic.update_attribute :topic_sources_attributes, [{
+      :id => cpk,
+      :keywords => 'jazz'
+    }]
+
+    topic_source = TopicSource.find_by_platform(platform)
+    assert_kind_of(TopicSource, topic_source)
+    assert_equal(topic_source.keywords, 'jazz')
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key_2
+    topic = topics(:music)
+    topic_source = topic_sources(:music_source)
+
+    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id,
+                                                           :keywords => 'classical, jazz'}])
+
+    topic_source.reload
+    assert_equal(topic_source.keywords, 'classical, jazz')
+  end
+
+  def test_nested_attributes_update_with_string_in_primary_key_3
+    topic = topics(:music)
+    topic_source = topic_sources(:music_source)
+
+    topic.update_attributes(:topic_sources_attributes => [{:id => topic_source.id.to_s,
+                                                           :keywords => 'classical, jazz'}])
+
+    topic_source.reload
+    assert_equal(topic_source.keywords, 'classical, jazz')
+  end
 end

data/test/test_optimistic.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestOptimisitic < ActiveSupport::TestCase
+  fixtures :restaurants
+
+  def test_update_with_stale_error
+    restaurant_1 = Restaurant.find([1, 1])
+    restaurant_1['name'] = "McDonalds renamed"
+
+    restaurant_2 = Restaurant.find([1, 1])
+    restaurant_2['name'] = "McDonalds renamed 2"
+
+    assert(restaurant_1.save)
+    assert_raise ActiveRecord::StaleObjectError do
+      restaurant_2.save
+    end
+  end
+end

data/test/test_suite.rb

@@ -19,6 +19,7 @@
   test_ids
   test_miscellaneous
   test_nested_attributes
+  test_optimistic
   test_pagination
   test_polymorphic
   test_predicates

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.12
+  version: 7.0.13
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -60,6 +60,7 @@ files:
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/locking/optimistic.rb
 - lib/composite_primary_keys/model_schema.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
@@ -158,6 +159,10 @@ files:
 - test/fixtures/suburbs.yml
 - test/fixtures/tariff.rb
 - test/fixtures/tariffs.yml
+- test/fixtures/topic.rb
+- test/fixtures/topic_source.rb
+- test/fixtures/topic_sources.yml
+- test/fixtures/topics.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
@@ -184,6 +189,7 @@ files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
+- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
@@ -214,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -244,6 +250,7 @@ test_files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
+- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb