composite_primary_keys 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c978ed5109a507f202bab7ad54362c0f543d7ed6
-  data.tar.gz: 65dac9d9389d1cbf8727ec25a5cc1a93a706d91f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWNiZWUyNjQ5MTQ5Y2UzYTI4Nzg1NjcyOGMxOTBhYzJmZTAzMmZmNQ==
+  data.tar.gz: !binary |-
+    OWM0NTg5MmYyMzI5OTViODJmYTJlYmZhOGEyOWNjMjY2MWQzMzNjYQ==
 SHA512:
-  metadata.gz: 340806c9233d93bb1d18e4203080650600de58400231302bcf50b9f019f056d99d0c9883dc534d8483d081249b968bcf205f29e35fdb852565cc795ac9f4da5c
-  data.tar.gz: 10e4247371f8e979b96074ebe2e55ee79da37cc6a37ea03be8f21e48610180d122625f6690cd70eabf6fec65d4c017061cc52042ea81376b5bec0b72a94f3833
+  metadata.gz: !binary |-
+    MzE2Y2ViOTJiMDVkZGU4ZTQwMTJjODBjZjViN2ZmOGViMGI5MDJmOGQ1YTMw
+    OGMxYzg1YjhjNDVkMTYzZjIyNzU3Njg5YWI5YzY4NjY5NTJmYWY0NDllZGI1
+    ZmIxZmY0MjMxYzkyN2IzNmU0ZTgyZjk3MGUyYWZkMzkyNmMwMjU=
+  data.tar.gz: !binary |-
+    NTBlNGNhNjBiMTEwMWM5YjcyZmY5OGNjMmQzNTQ4YjhkN2IxZWQ5OGE0MjYw
+    ZGNhOTE5NzY2M2MxZWNjMmNkYjU3NWIyYTQ0OWYyYzYwYzM1YWJjYTkyOTI0
+    MDExYTkyYzIwNTgzNzI2OTY4ZTBmOGIwYmQ5Njc1Mjc5ZmI5ODg=

data/History.rdoc

@@ -1,3 +1,12 @@
+== 6.0.3 (2014-04-28)
+
+* Fixes setting of primary key when CPK is not used for a given model (see #191)
+
+== 6.0.2 (2014-04-28)
+
+* Fixes relating to ActiveRecord 4.0.x compatibility (Dan Draper)
+* Ensure that primary key is set on instance when creating new records (Dan Draper)
+
 == 6.0.1 (2013-11-29)
 
 * Handle records == :all in HasManyAssociation#delete_records. Without this calling

data/README.rdoc

@@ -12,7 +12,7 @@ This RubyGem extends the activerecord gem to provide CPK support.
 == Usage
 
     require 'composite_primary_keys'
-    class ProductVariation
+    class ProductVariation < ActiveRecord::Base
       self.primary_keys = :product_id, :variation_seq
     end
 

data/lib/composite_primary_keys.rb

@@ -48,6 +48,7 @@ require 'active_record/associations/preloader/association'
 require 'active_record/associations/preloader/belongs_to'
 require 'active_record/associations/preloader/has_and_belongs_to_many'
 
+
 require 'active_model/dirty'
 
 require 'active_record/attribute_methods/dirty'
@@ -67,6 +68,7 @@ require 'active_record/validations/uniqueness'
 
 # CPK files
 require 'composite_primary_keys/persistence'
+require 'composite_primary_keys/active_record_overides'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'
 require 'composite_primary_keys/composite_arrays'
@@ -102,4 +104,4 @@ require 'composite_primary_keys/relation/calculations'
 require 'composite_primary_keys/relation/finder_methods'
 require 'composite_primary_keys/relation/query_methods'
 
-require 'composite_primary_keys/validations/uniqueness'
+require 'composite_primary_keys/validations/uniqueness'

data/lib/composite_primary_keys/active_record_overides.rb

@@ -0,0 +1,37 @@
+module CompositePrimaryKeys
+  module ActiveRecord
+    module Overides
+ 
+      # This override ensures that pkeys are set on the instance when records are created.
+      # However, while ActiveRecord::Persistence defines a create_record method
+      # the call in create_or_update is actually calling the method create_record in the Dirty concern
+      # which removes the pkey attrs and also sets updated/created at timestamps
+      # For some reason when we overide here we lose dirty!
+      # So, for now, timestamps are recorded explicitly
+      def create_record(attribute_names = nil)
+        record_timestamps!
+        attribute_names ||= keys_for_partial_write
+        attributes_values = arel_attributes_with_values_for_create(attribute_names)
+
+        new_id = self.class.unscoped.insert attributes_values
+        self.id = new_id if self.class.primary_key
+
+        @new_record = false
+        id
+      end
+
+      def record_timestamps!
+        if self.record_timestamps
+          current_time = current_time_from_proper_timezone
+
+          all_timestamp_attributes.each do |column|
+            if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
+              write_attribute(column.to_s, current_time)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/composite_primary_keys/base.rb

@@ -23,9 +23,9 @@ module ActiveRecord
         end
       end
 
-      def primary_keys=(keys)
+      def primary_key_with_composite_key_support=(keys)
         unless keys.kind_of?(Array)
-          self.primary_key = keys
+          self.primary_key_without_composite_key_support = keys
           return
         end
 
@@ -34,8 +34,11 @@ module ActiveRecord
         class_eval <<-EOV
           extend  CompositeClassMethods
           include CompositeInstanceMethods
+          include CompositePrimaryKeys::ActiveRecord::Overides
         EOV
       end
+      alias_method_chain :primary_key=, :composite_key_support
+      alias_method :primary_keys=, :primary_key=
 
       def set_primary_keys(*keys)
         ActiveSupport::Deprecation.warn(
@@ -113,7 +116,7 @@ module ActiveRecord
 
       def ==(comparison_object)
         return true if equal? comparison_object
-        ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| id.present?} : super(comparison_object)
+        ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| !id.nil?} : super(comparison_object)
       end
 
       def can_change_primary_key_values?

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -31,6 +31,16 @@ module ActiveRecord
 
         [sql, binds]
       end
+
+      # Returns a single value if query returns a single element
+      # otherwise returns an array coresponding to the composite keys
+      #
+      def last_inserted_id(result)
+        row = result.rows.first
+        if Array === row
+          row.size == 1 ? row[0] : row
+        end
+      end
     end
   end
-end
+end

data/lib/composite_primary_keys/relation/batches.rb

@@ -24,7 +24,7 @@ module CompositePrimaryKeys
         # records = relation.where(table[primary_key].gteq(start)).all
         records = self.primary_key.reduce(relation) do |rel, key|
           rel.where(table[key].gteq(start))
-        end.all
+        end
 
         while records.any?
           records_size = records.size

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -25,6 +25,8 @@ ActiveRecord::Base.configurations[:test] = spec
 # Tell ActiveRecord where to find models
 ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
 
+I18n.config.enforce_available_locales = true
+
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
   
@@ -71,7 +73,7 @@ class ActiveSupport::TestCase
       @klass_info = classes[@key_test]
       @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
       order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      @first = @klass.find(:first, :order => order)
+      @first = @klass.order(order).first
       yield
     end
   end

data/test/fixtures/reference_code_using_composite_key_alias.rb

@@ -0,0 +1,8 @@
+class ReferenceCodeUsingCompositeKeyAlias < ActiveRecord::Base
+  self.table_name = 'reference_codes'
+  self.primary_key = [: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/reference_code_using_simple_key_alias.rb

@@ -0,0 +1,8 @@
+class ReferenceCodeUsingSimpleKeyAlias < ActiveRecord::Base
+  self.table_name = 'reference_codes'
+  self.primary_key = :code_label
+  
+  belongs_to :reference_type, :foreign_key => "reference_type_id"
+  
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/room.rb

@@ -6,6 +6,6 @@ class Room < ActiveRecord::Base
   has_many :room_attributes, :through => :room_attribute_assignments
   
   def find_custom_room_attributes
-    room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "type"])
+    room_attributes.where("room_attributes.name != ?", "type")
   end
 end

data/test/fixtures/user.rb

@@ -5,6 +5,6 @@ class User < ActiveRecord::Base
   has_many :hacks, :through => :comments, :source => :hack
   
   def find_custom_articles
-    articles.find(:all, :conditions => ["name = ?", "Article One"])
+    articles.where("name = ?", "Article One")
   end
 end

data/test/test_aliases.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAliases < ActiveSupport::TestCase
+  fixtures :reference_codes
+
+  def test_primary_key_setter_alias_composite_key
+    reference_code = ReferenceCodeUsingCompositeKeyAlias.find([1, 2])
+    assert_equal 'MRS', reference_code.code_label
+    assert_equal 'Mrs', reference_code.abbreviation
+  end
+
+  def test_primary_key_setter_alias_simple_key
+    reference_code = ReferenceCodeUsingSimpleKeyAlias.find('MRS')
+    assert_equal 1, reference_code.reference_type_id
+    assert_equal 2, reference_code.reference_code
+    assert_equal 'Mrs', reference_code.abbreviation
+  end
+end

data/test/test_associations.rb

@@ -29,7 +29,7 @@ class TestAssociations < ActiveSupport::TestCase
   # Its not generating the instances of associated classes from the rows
   def test_find_includes
     # Old style
-    products = Product.find(:all, :include => :product_tariffs)
+    products = Product.includes(:product_tariffs).all
     assert_equal(3, products.length)
     assert_equal(3, products.inject(0) {|sum, product| sum + product.product_tariffs.length})
 
@@ -44,8 +44,9 @@ class TestAssociations < ActiveSupport::TestCase
     product_tarrif = product_tariffs(:second_free)
 
     # Old style, include a where clause to force eager loading
-    products = Product.find(:all, :include => :product_tariffs,
-                                  :conditions => ["product_tariffs.product_id = ?", product.id])
+    #products = Product.find(:all, :include => :product_tariffs,
+    #                              :conditions => ["product_tariffs.product_id = ?", product.id])
+    products = Product.includes(:product_tariffs).where("product_tariffs.product_id = ?", product.id).references(:product_tariffs)
 
     assert_equal(1, products.length)
     assert_equal(product, products.first)
@@ -60,7 +61,7 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_find_includes_tariffs
     # Old style
-    tariffs = Tariff.find(:all, :include => :product_tariffs)
+    tariffs = Tariff.includes(:product_tariffs)
     assert_equal(3, tariffs.length)
     assert_equal(3, tariffs.inject(0) {|sum, tariff| sum + tariff.product_tariffs.length})
 
@@ -72,7 +73,7 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_find_includes_product_tariffs_product
     # Old style
-    product_tariffs = ProductTariff.find(:all, :include => :product)
+    product_tariffs = ProductTariff.includes(:product)
     assert_not_nil(product_tariffs)
     assert_equal(3, product_tariffs.length)
 
@@ -84,7 +85,7 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_find_includes_product_tariffs_tariff
     # Old style
-    product_tariffs = ProductTariff.find(:all, :include => :tariff)
+    product_tariffs = ProductTariff.includes(:tariff)
     assert_equal(3, product_tariffs.length)
 
     # New style
@@ -93,7 +94,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_many_through
-    products = Product.find(:all, :include => :tariffs)
+    products = Product.includes(:tariffs)
     assert_equal(3, products.length)
 
     tarrifs_length = products.inject(0) {|sum, product| sum + product.tariffs.length}
@@ -101,12 +102,12 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_new_style_includes_with_conditions
-    product_tariff = ProductTariff.includes(:tariff).where('tariffs.amount < 5').first
+    product_tariff = ProductTariff.includes(:tariff).where('tariffs.amount < 5').references(:tariffs).first
     assert_equal(0, product_tariff.tariff.amount)
   end
 
   def test_find_product_includes
-    products = Product.find(:all, :include => {:product_tariffs => :tariff})
+    products = Product.includes(:product_tariffs => :tariff)
     assert_equal(3, products.length)
 
     product_tariffs_length = products.inject(0) {|sum, product| sum + product.product_tariffs.length}
@@ -114,7 +115,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_find_tariffs_includes
-    tariffs = Tariff.find(:all, :include => {:product_tariffs => :product})
+    tariffs = Tariff.includes(:product_tariffs => :product)
     assert_equal(3, tariffs.length)
 
     product_tariffs_length = tariffs.inject(0) {|sum, tariff| sum + tariff.product_tariffs.length}
@@ -122,7 +123,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_many_through_when_not_pre_loaded
-  	student = Student.find(:first)
+  	student = Student.first
   	rooms = student.rooms
   	assert_equal(1, rooms.size)
   	assert_equal(1, rooms.first.dorm_id)
@@ -130,7 +131,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_many_through_when_through_association_is_composite
-    dorm = Dorm.find(:first)
+    dorm = Dorm.first
     assert_equal(3, dorm.rooms.length)
     assert_equal(1, dorm.rooms.first.room_attributes.length)
     assert_equal('type', dorm.rooms.first.room_attributes.first.name)
@@ -143,10 +144,10 @@ class TestAssociations < ActiveSupport::TestCase
     suburb = Suburb.find([2, 1])
     assert_equal 1, suburb.first_streets.size
 
-    suburb = Suburb.find([2, 1], :include => :streets)
+    suburb = Suburb.includes(:streets).find([2, 1])
     assert_equal 2, suburb.streets.size
 
-    suburb = Suburb.find([2, 1], :include => :first_streets)
+    suburb = Suburb.includes(:first_streets).find([2, 1])
     assert_equal 1, suburb.first_streets.size
   end
 
@@ -220,53 +221,46 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_joins_has_many_with_primary_key
-    @membership = Membership.find(:first, :joins => :readings, :conditions => { :readings => { :id => 1 } })
+    #@membership = Membership.find(:first, :joins => :readings, :conditions => { :readings => { :id => 1 } })
+    @membership = Membership.joins(:readings).where(readings: { id: 1 }).first
 
     assert_equal [1, 1], @membership.id
   end
 
   def test_joins_has_one_with_primary_key
-    @membership = Membership.find(:first, :joins => :readings,
-                                          :conditions => { :readings => { :id => 2 } })
+    @membership = Membership.joins(:readings).where(readings: { id: 2 }).first
 
     assert_equal [1, 1], @membership.id
   end
 
   def test_has_many_through_with_conditions_when_through_association_is_not_composite
-    user = User.find(:first)
-    assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size
+    user = User.first
+    assert_equal 1, user.articles.where("articles.name = ?", "Article One").size
   end
 
   def test_has_many_through_with_conditions_when_through_association_is_composite
-    room = Room.find(:first)
-    assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "type"]).size
+    room = Room.first
+    assert_equal 0, room.room_attributes.where("room_attributes.name != ?", "type").size
   end
 
   def test_has_many_through_on_custom_finder_when_through_association_is_composite_finder_when_through_association_is_not_composite
-    user = User.find(:first)
+    user = User.first
     assert_equal(1, user.find_custom_articles.size)
   end
 
   def test_has_many_through_on_custom_finder_when_through_association_is_composite
-    room = Room.find(:first)
+    room = Room.first
     assert_equal(0, room.find_custom_room_attributes.size)
   end
 
   def test_has_many_with_primary_key_with_associations
-    # Trigger Active Records find_with_associations method
-    memberships = Membership.find(:all, :include => :statuses,
-                                        :conditions => ["membership_statuses.status = ?",
-                                                        'Active'])
-
+    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').references(:membership_statuses)
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end
 
   def test_limitable_reflections
-    memberships = Membership.find(:all, :include => :statuses,
-                                        :conditions => ["membership_statuses.status = ?",
-                                                        'Active'],
-                                        :limit => 1)
+    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').limit(1)
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end

data/test/test_calculations.rb

@@ -6,28 +6,27 @@ class TestCalculations < ActiveSupport::TestCase
            :departments, :employees, :memberships, :membership_statuses
 
   def test_count
-    assert_equal(3, Product.count(:include => :product_tariffs))
-    assert_equal(3, Tariff.count(:include => :product_tariffs))
+    assert_equal(3, Product.includes(:product_tariffs).count)
+    assert_equal(3, Tariff.includes(:product_tariffs).count)
 
     expected = {Date.today => 2,
                 Date.today.next => 1}
 
-    assert_equal(expected, Tariff.count(:group => :start_date))
+    assert_equal(expected, Tariff.group(:start_date).count)
   end
 
   def test_count_distinct
     product = products(:first_product)
-    assert_equal(1, product.product_tariffs.select('tariff_start_date').count(:distinct => true))
+    assert_equal(1, product.product_tariffs.select('tariff_start_date').distinct.count)
   end
   
   def test_count_not_distinct
     product = products(:first_product)
-    assert_equal(2, product.product_tariffs.select('tariff_start_date').count(:distinct => false))
+    assert_equal(2, product.product_tariffs.select('tariff_start_date').count)
   end
 
   def test_count_includes
-    count = Dorm.count(:include => :rooms,
-                       :conditions => ["rooms.room_id = ?", 2])
+    count = Dorm.where("rooms.room_id = ?", 2).includes(:rooms).references(:rooms).count
     assert_equal(1, count)
   end
 
@@ -35,4 +34,4 @@ class TestCalculations < ActiveSupport::TestCase
     count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
     assert_equal(1, count)
   end
-end
+end