composite_primary_keys 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb06f6e03a4f6976e562dc14e7943508372809c3
-  data.tar.gz: bb48d494707c41060e43cd7c1d4af62f6f20c70a
+  metadata.gz: fbf168474ed65f8ab1b123eec93d3e63fa218e8a
+  data.tar.gz: 4e3168853f10d4bd5fd564e6beb27972dbee0588
 SHA512:
-  metadata.gz: 3d86a6f26ddac7fd14728862eb0a012efc0d6e4746e4d27f715097f6863c4412816c924278ec58b97220671fc7e8434e1b608df6a5365623d7889323d427cce7
-  data.tar.gz: dcca7b514f7f8748c6df1f8ac31d84491a6c9893daa21157413c528f5597fe008a99bf69ab57da684c1ea999b7d9c842b2cd3a060bcee342f06e1b48dc751a16
+  metadata.gz: 5e486302769c4f5fab7270a6f3ca684bfdbf1826aa7ae16d9a11b0d4883ab97d93361bb22dff69389c1f2eabc133a201b4f1a4b1150b371f73d4bb16f5d32cb4
+  data.tar.gz: 2d740b4e57d3f206956b202cfbde77b0acb550da97c14d717369c06666c1dfa9098ad8a5159bfa40826f124161c637870b3a61d624a68d5e83ae7276571e3d73

data/History.rdoc

@@ -1,7 +1,26 @@
-== 8.0.0 (2014-01-?)
+== 8.1.0 (2014-03-23)
+
+* ActiveRecord 4.2.1 support (Charlie Savage)
+* Change parsing of composite ids to fix #290 (Charlie Savage)
+* Add sqlserver setting for test suite (Joachim Herb)
+* Fix sqlserver adapater, isse #224 (Joachim Herb)
+* Update readme file to include version 8.* information (David Silva)
+
+
+== 8.0.1 (2014-01-24)
+
+* Support optimistic lock and lock_version added to existing fixtures (Kirika)
+
+== 8.0.0 (2014-01-10)
 
 * ActiveRecord 4.2.* support (Sammy Larbi)
 
+== 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)
@@ -88,6 +107,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

@@ -20,6 +20,7 @@ Every major version of ActiveRecord has included numerous internal changes.  As
 CPK has to be rewritten for each version of ActiveRecord.  To help keep
 things straight, here is the mapping:
 
+    Version 8.x is designed to work with ActiveRecord 4.2.x
     Version 7.x is designed to work with ActiveRecord 4.1.x
     Version 6.x is designed to work with ActiveRecord 4.0.x
     Version 5.x is designed to work with ActiveRecord 3.2.x

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '4.2.0'
+  gem 'activerecord', '~>4.2.0'
   require 'active_record'
 end
 
@@ -54,6 +54,7 @@ require 'active_record/attribute_set/builder'
 require 'active_record/attribute_methods/primary_key'
 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'
@@ -97,6 +98,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/associations/singular_association.rb

@@ -3,7 +3,10 @@ module CompositePrimaryKeys
     extend ActiveSupport::Concern
     included do
       def get_records_with_cpk_support
-        cpk_applies = (target && target.composite?) || (owner && owner.composite?)
+        cpk_applies = (target && target.composite?) ||
+          (owner && owner.composite?) ||
+          (options[:primary_key] && options[:primary_key].kind_of?(Array)) || 
+          (options[:foreign_key] && options[:foreign_key].kind_of?(Array))
         return scope.limit(1).to_a if cpk_applies
         get_records_without_cpk_support
       end
@@ -12,4 +15,4 @@ module CompositePrimaryKeys
   end
 end
 
-ActiveRecord::Associations::SingularAssociation.send(:include, CompositePrimaryKeys::SingularAssociation)
+ActiveRecord::Associations::SingularAssociation.send(:include, CompositePrimaryKeys::SingularAssociation)

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -3,16 +3,21 @@ module ActiveRecord
     module Read
       def read_attribute(attr_name, &block)
         # CPK
-        # name = attr_name.to_s
-        # name = self.class.primary_key if name == 'id'
-        # @attributes.fetch_value(name, &block)
-        
         if attr_name.kind_of?(Array)
-          attr_name.map {|name| read_attribute(name)}.to_composite_keys
+          _read_attribute(attr_name, &block)
         else
           name = attr_name.to_s
-          name = self.class.primary_key if name == 'id' && !composite?
-          @attributes.fetch_value(name, &block)
+          name = self.class.primary_key if name == 'id'
+          _read_attribute(name, &block)
+        end
+      end
+
+      def _read_attribute(attr_name)
+        # CPK
+        if attr_name.kind_of?(Array)
+          attr_name.map {|name| @attributes.fetch_value(name.to_s)}
+        else
+          @attributes.fetch_value(attr_name.to_s) { |n| yield n if block_given? }
         end
       end
     end

data/lib/composite_primary_keys/composite_arrays.rb

@@ -8,8 +8,21 @@ module CompositePrimaryKeys
     end
   end
 
+  def self.normalize(ids)
+    ids.map do |id|
+      if id.is_a?(Array)
+        normalize(id)
+      elsif id.is_a?(String) && id.index(ID_SEP)
+        id.split(ID_SEP)
+      else
+        id
+      end
+    end
+  end
+
   class CompositeKeys < Array
-    def self.parse(value)
+
+  def self.parse(value)
       case value
       when Array
         value.to_composite_keys

data/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb

@@ -4,6 +4,9 @@ module ActiveRecord
       if (adapter.to_s =~ /postgresql/) or (adapter.to_s =~ /postgis/)
         require "composite_primary_keys/connection_adapters/postgresql_adapter.rb"
       end
+      if (adapter.to_s =~ /sqlserver/)
+        require "composite_primary_keys/connection_adapters/sqlserver_adapter.rb"
+      end
     end
 
     def self.establish_connection(spec = ENV["DATABASE_URL"])

data/lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLServerAdapter
+      def sql_for_insert(sql, pk, id_value, sequence_name, binds)
+        sql = if pk && self.class.use_output_inserted
+          # support composite primary keys consisting of more than one column name
+          quoted_pks = [pk].flatten.map {|pk| "INSERTED.#{SQLServer::Utils.extract_identifiers(pk).quoted}"}
+          sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT #{quoted_pks.join(", ")}"
+#          p sql
+        else
+          "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
+        end
+        [sql, binds]
+      end
+        end
+      end
+end

data/lib/composite_primary_keys/core.rb

@@ -16,54 +16,46 @@ module ActiveRecord
 
       super
     end
-    
-    
-  end
-end
-
-
-module CompositePrimaryKeys
-  module ActiveRecordCoreConcernIncludedExtension
-    extend ActiveSupport::Concern
 
-    included do
-      def self.find(*ids)
-        if composite?
-          super(cpk_parse_ids(ids))
-        else
-          super
+    module ClassMethods
+      def find(*ids) # :nodoc:
+        # We don't have cache keys for this stuff yet
+        return super unless ids.length == 1
+        # Allow symbols to super to maintain compatibility for deprecated finders until Rails 5
+        return super if ids.first.kind_of?(Symbol)
+        return super if block_given? ||
+          primary_key.nil? ||
+          default_scopes.any? ||
+          current_scope ||
+          columns_hash.include?(inheritance_column) ||
+          ids.first.kind_of?(Array)
+
+        # CPK
+        return super if self.composite?
+
+        id  = ids.first
+        if ActiveRecord::Base === id
+          id = id.id
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            You are passing an instance of ActiveRecord::Base to `find`.
+            Please pass the id of the object by calling `.id`
+          MSG
         end
-      end
-      
-      private
-      def self.cpk_parse_ids(ids)
-        result = []
-        ids.each do |id|
-          if id.is_a?(String)
-            if id.index(",")
-              result << [id.split(",")]
-            else
-              result << [id]
-            end
-          elsif id.is_a?(Array) && id.count > 1 && id.first.to_s.index(",")
-            result << id.map{|subid| subid.split(",")}
-          else
-            result << [id]
-          end
-        end
-        
-        copy_to_find_depth, depth = result.dup, -1
-
-        until copy_to_find_depth == result.flatten
-          depth += 1
-          copy_to_find_depth = copy_to_find_depth.flatten(1)
+        key = primary_key
+
+        s = find_by_statement_cache[key] || find_by_statement_cache.synchronize {
+          find_by_statement_cache[key] ||= StatementCache.create(connection) { |params|
+            where(key => params.bind).limit(1)
+          }
+        }
+        record = s.execute([id], self, connection).first
+        unless record
+          raise RecordNotFound, "Couldn't find #{name} with '#{primary_key}'=#{id}"
         end
-        
-        result = result.flatten(depth)
-        return result
+        record
+      rescue RangeError
+        raise RecordNotFound, "Couldn't find #{name} with an out of range value for '#{primary_key}'"
       end
     end
   end
-end
-  
-ActiveRecord::Base.send(:include, CompositePrimaryKeys::ActiveRecordCoreConcernIncludedExtension)
+end

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/relation/finder_methods.rb

@@ -75,28 +75,32 @@ module CompositePrimaryKeys
 
         connection.select_value(relation, "#{name} Exists", relation.bind_values) ? true : false
       end
-      
+
       def find_with_ids(*ids)
-        # CPK handle strings that come w/ calling to_param on CPK-enabled models
-        ids = cpk_parse_ids(ids)
         raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
 
-        expects_array = ids.first.kind_of?(Array)
+        # CPK
+        #expects_array = ids.first.kind_of?(Array)
+        ids = CompositePrimaryKeys.normalize(ids)
+        expects_array = ids.flatten != ids.flatten(1)
+
         return ids.first if expects_array && ids.first.empty?
 
-        # CPK - don't do this, we want an array of arrays
+        # CPK
         #ids = ids.flatten.compact.uniq
+        ids = expects_array ? ids.first : ids
+
         case ids.size
           when 0
             raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
           when 1
             result = find_one(ids.first)
-            # CPK
-            # expects_array ? [ result ] : result
-            result
+            expects_array ? [ result ] : result
           else
             find_some(ids)
         end
+      rescue RangeError
+        raise RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
       end
 
       def find_one(id)

data/lib/composite_primary_keys/version.rb

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

data/test/connections/databases.example.yml

@@ -16,3 +16,10 @@ postgresql:
   database: composite_primary_keys_unittest
   username: postgres
   host: localhost
+
+sqlserver:
+  adapter: sqlserver
+  database: composite_primary_keys_unittest
+  username: rails
+  host: localhost
+  port: 1433

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

@@ -108,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/mysql.sql

@@ -119,6 +119,16 @@ create table employees (
     primary key (id)
 );
 
+create table salaries (
+    id int not null auto_increment,
+    employee_id int,
+    location_id int,
+    year int not null,
+    month int not null,
+    value int default null,
+    primary key (id)
+);
+
 create table comments (
     id int not null auto_increment,
     person_id int default null,
@@ -138,6 +148,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.sql

@@ -146,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

@@ -121,6 +121,16 @@ create table employees (
     primary key (id)
 );
 
+create table salaries (
+    id          serial not null,
+    employee_id int,
+    location_id int,
+    year        int not null,
+    month       int not null,
+    value       int default null,
+    primary key (id)
+);
+
 create table comments (
     id          serial not null,
     person_id   int          default null,
@@ -140,6 +150,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

@@ -112,6 +112,15 @@ create table employees (
     location_id integer null
 );
 
+create table salaries (
+    id integer not null primary key autoincrement,
+    employee_id integer,
+    location_id integer,
+    year int not null,
+    month int not null,
+    value int default null
+);
+
 create table comments (
     id integer not null primary key autoincrement,
     person_id int null,
@@ -129,6 +138,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.sql

@@ -148,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] )
 );
@@ -222,4 +223,4 @@ CREATE TABLE products_restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL
 );
-go
+go

data/test/fixtures/employee.rb

@@ -2,4 +2,10 @@ class Employee < ActiveRecord::Base
 	belongs_to :department, :foreign_key => [:department_id, :location_id]
 	has_many :comments, :as => :person
 	has_and_belongs_to_many :groups
+        has_many :salaries,
+          :primary_key => [:id, :location_id],
+          :foreign_key => [:employee_id, :location_id]
+        has_one :one_salary, :class_name => "Salary",
+          :primary_key => [:id, :location_id],
+          :foreign_key => [:employee_id, :location_id]
 end

data/test/fixtures/salary.rb

@@ -0,0 +1,5 @@
+class Salary < ActiveRecord::Base
+  belongs_to :employee,
+    :primary_key => [:id, :location_id],
+    :foreign_key => [:employee_id, :location_id]
+end

data/test/test_associations.rb

@@ -81,6 +81,21 @@ class TestAssociations < ActiveSupport::TestCase
     refute_equal accounting_head, engineering_head
   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")
+
+    jill = employees(:jill)
+    jill_salary = jill.create_one_salary(year: "2015", month: "1")
+
+    steve_salary.reload
+    jill_salary.reload
+    assert_equal(steve.id, steve_salary.employee_id)
+    assert_equal(1, steve_salary.location_id)
+    assert_equal(jill.id, jill_salary.employee_id)
+    assert_equal(1, jill_salary.location_id)
+  end
+
   def test_has_many_association_is_not_cached_to_where_it_returns_the_wrong_ones
     engineering = departments(:engineering)
     engineering_employees = engineering.employees
@@ -91,6 +106,36 @@ class TestAssociations < ActiveSupport::TestCase
     refute_equal accounting_employees, engineering_employees
   end
 
+  def test_has_many_association_primary_key_and_foreign_key_are_present
+    steve = employees(:steve)
+    steve_salary = steve.salaries.create(year: 2015, month: 1)
+
+    jill = employees(:jill)
+    jill_salary = jill.salaries.create(year: 2015, month: 1)
+
+    steve_salary.reload
+    jill_salary.reload
+    assert_equal(steve.id, steve_salary.employee_id)
+    assert_equal(1, steve_salary.location_id)
+    assert_equal(jill.id, jill_salary.employee_id)
+    assert_equal(1, jill_salary.location_id)
+  end
+
+  def test_belongs_to_association_primary_key_and_foreign_key_are_present
+    salary_01 = Salary.new(year: 2015, month: 1, employee_id: 5, location_id: 1)
+    employee_01 = salary_01.create_employee
+    salary_02 = Salary.new(year: 2015, month: 1, employee_id: 6, location_id: 1)
+    employee_02 = salary_02.create_employee
+
+    employee_01.reload
+    employee_02.reload
+
+    assert_equal(5, employee_01.id)
+    assert_equal(1, employee_01.location_id)
+    assert_equal(6, employee_02.id)
+    assert_equal(1, employee_02.location_id)
+  end
+
   def test_find_includes_product_tariffs_product
     # Old style
     product_tariffs = ProductTariff.includes(:product)

data/test/test_attributes.rb

@@ -42,13 +42,13 @@ class TestAttributes < ActiveSupport::TestCase
       end
     end
   end
-    
+
   def test_brackets_foreign_key_assignment
     tarrif = tariffs(:flat)
     product_tariff = product_tariffs(:first_flat)
     compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
   end
-  
+
   private
 
   def compare_indexes(obj1, indexes1, obj2, indexes2)

data/test/test_create.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCreate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :streets, :suburbs
+  fixtures :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
   
   CLASSES = {
     :single => {
@@ -109,4 +109,49 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(25, suburb.suburb_id)
     assert_equal("My Suburb", suburb.name)
   end
+
+  def test_has_many_ids_1
+    dorm = dorms(:toyon)
+    room = Room.new(:dorm_id => dorm.id, :room_id => 5)
+    room.save!
+
+    student1 = students(:kelly)
+    student2 = students(:jordan)
+
+    RoomAssignment.delete_all
+
+    assignment1 = RoomAssignment.new(:student_id => student1.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
+    assignment1.save!
+
+    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id]]
+    room.save!
+
+    assert_equal(1, room.room_assignments.length)
+    assert_equal(assignment1, room.room_assignments.first)
+  end
+
+  def test_has_many_ids_2
+    dorm = dorms(:toyon)
+    room = Room.new(:dorm_id => dorm.id, :room_id => 5)
+    room.save!
+
+    student1 = students(:kelly)
+    student2 = students(:jordan)
+
+    RoomAssignment.delete_all
+
+    assignment1 = RoomAssignment.new(:student_id => student1.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
+    assignment1.save!
+
+    assignment2 = RoomAssignment.new(:student_id => student2.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
+    assignment2.save!
+
+    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id],
+                                [assignment2.student_id, assignment2.dorm_id, assignment2.room_id]]
+    room.save!
+
+    assert_equal(2, room.room_assignments.length)
+    assert_equal(assignment1, room.room_assignments[0])
+    assert_equal(assignment2, room.room_assignments[1])
+  end
 end

data/test/test_delete.rb

@@ -97,6 +97,16 @@ class TestDelete < ActiveSupport::TestCase
     assert_equal records_after, records_before - steve.groups.count
   end
 
+  def test_destroy_has_and_belongs_to_many_on_non_cpk
+    records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
+    employee = Employee.create
+    employee.groups << Group.create(name: 'test')
+    employees_groups_count = employee.groups.count
+    employee.destroy!
+    records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
+    assert_equal records_before, records_after
+  end
+  
   def test_delete_not_destroy_on_cpk
     tariff = Tariff.where(tariff_id: 2).first
     tariff.delete

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

data/test/test_tutorial_example.rb

@@ -4,19 +4,23 @@ class TestTutorialExample < ActiveSupport::TestCase
   fixtures :users, :groups, :memberships, :membership_statuses
   
   def test_membership
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
+    membership = Membership.find([1, 1])
+    assert(membership, "Cannot find a membership")
     assert(membership.user)
     assert(membership.group)
   end
   
   def test_status
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
-    assert(statuses = membership.statuses, "No has_many association to status")
+    membership = Membership.find([1, 1])
+    statuses = membership.statuses
+    assert(membership, "Cannot find a membership")
+    assert(statuses, "No has_many association to status")
     assert_equal(membership, statuses.first.membership)
   end
   
   def test_count
-    assert(membership = Membership.find([1, 1]), "Cannot find a membership")
+    membership = Membership.find([1, 1])
+    assert(membership, "Cannot find a membership")
     assert_equal(1, membership.statuses.count)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,9 +58,11 @@ files:
 - 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/postgresql_adapter.rb
+- lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
 - 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
@@ -149,6 +151,7 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
+- test/fixtures/salary.rb
 - test/fixtures/seat.rb
 - test/fixtures/seats.yml
 - test/fixtures/street.rb
@@ -189,6 +192,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
@@ -249,6 +253,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