composite_primary_keys 4.0.0.beta2 → 4.0.0.beta3

data/History.txt

@@ -1,4 +1,8 @@
-== 4.0.0.beta2 Not released
+== 4.0.0.beta3 2011-07-08
+* Fix the ability to update the values of a primary key (Travis Warlick)
+* Support port and host configurations for postgres rake tasks (Travis Warlick)
+
+== 4.0.0.beta2 2011-06-21
 * ActiveRecord 3.1 RC4 compatibility.
 * Fix instantiation of CPK models with included associations
 
@@ -6,10 +10,11 @@
 * ActiveRecord 3.1 RC1 compatibility.  This required a significant rewrite due to
   all the changes in AR 3.1 versus 3.0.
 
-== 3.1.10 Not released
+== 3.1.10 2011-07-08
 * Bugfix for belongs_to with includes (John Ash)
 * Improved tests for calling clear on a habtm association, which involved (David Rueck)
 * Fixed bug that resulted in unrelated records being deleted when calling (David Rueck)
+* Output deprecation warnings about extra columns in join table CPK-aware (David Rueck)
 
 
 == 3.1.9 2011-06-04

data/lib/composite_primary_keys.rb

@@ -46,6 +46,8 @@ 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'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
@@ -80,6 +82,8 @@ require 'composite_primary_keys/associations/preloader/association'
 require 'composite_primary_keys/associations/preloader/belongs_to'
 require 'composite_primary_keys/associations/preloader/has_and_belongs_to_many'
 
+require 'composite_primary_keys/dirty'
+
 require 'composite_primary_keys/attribute_methods/dirty'
 require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'

data/lib/composite_primary_keys/base.rb

@@ -120,6 +120,10 @@ module ActiveRecord
         populate_with_current_scope_attributes
         clear_timestamp_attributes
       end
+
+      def can_change_primary_key_values?
+        false
+      end
     end
   end
 end

data/lib/composite_primary_keys/dirty.rb

@@ -0,0 +1,19 @@
+module ActiveModel
+  module Dirty
+    def can_change_primary_key?
+      true
+    end
+
+    def primary_key_changed?
+      !!changed.detect { |key| ids_hash.keys.include?(key.to_sym) }
+    end
+
+    def primary_key_was
+      ids_hash.keys.inject(Hash.new) do |result, attribute_name|
+        result[attribute_name.to_sym] = attribute_was(attribute_name.to_s)
+        result
+      end
+    end
+    alias_method :ids_hash_was, :primary_key_was
+  end
+end

data/lib/composite_primary_keys/persistence.rb

@@ -32,15 +32,22 @@ module ActiveRecord
     end
 
     def update(attribute_names = @attributes.keys)
-      attributes_with_values = arel_attributes_values(false, false, attribute_names)
-      return 0 if attributes_with_values.empty?
       klass = self.class
-      # CPK
       if !self.composite?
+        attributes_with_values = arel_attributes_values(false, false, attribute_names)
+        return 0 if attributes_with_values.empty?
         stmt = klass.unscoped.where(klass.arel_table[klass.primary_key].eq(id)).arel.compile_update(attributes_with_values)
       else
-        # CPK
-        stmt =  klass.unscoped.where(ids_hash).arel.compile_update(attributes_with_values)
+        attributes_with_values = arel_attributes_values(can_change_primary_key?, false, attribute_names)
+        return 0 if attributes_with_values.empty?
+
+        if !can_change_primary_key? and primary_key_changed?
+          raise ActiveRecord::CompositeKeyError, "Cannot update primary key values without ActiveModel::Dirty"
+        elsif primary_key_changed?
+          stmt = klass.unscoped.where(primary_key_was).arel.compile_update(attributes_with_values)
+        else
+          stmt = klass.unscoped.where(ids_hash).arel.compile_update(attributes_with_values)
+        end
       end
       klass.connection.update stmt.to_sql
     end

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta2'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta3'].join('.')
   end
 end

data/test/connections/native_postgresql/connection.rb

@@ -7,6 +7,8 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys', 'connection_ada
 def connection_string
   options = Hash.new
   options['U'] = SPEC['username']  if SPEC['username']
+  options['h'] = SPEC['host']  if SPEC['host']
+  options['p'] = SPEC['port']  if SPEC['port']
   options.map { |key, value| "-#{key} #{value}" }.join(" ")
 end
 

data/test/fixtures/products.yml

@@ -1,7 +1,6 @@
 first_product:
   id: 1
   name: Product One
-  
 second_product:
   id: 2
   name: Product Two

data/test/fixtures/suburbs.yml

@@ -6,4 +6,7 @@ second:
   city_id: 2
   suburb_id: 1
   name: Second Suburb
-  
+no_mcdonalds:
+  city_id: 1
+  suburb_id: 2
+  name: Third Suburb  

data/test/test_habtm.rb

@@ -13,6 +13,48 @@ class TestHabtm < ActiveSupport::TestCase
     assert_equal 2, @restaurant.suburbs.size
   end
 
+  def test_include_cpk_both_sides
+    # assuming the association was set up in the fixtures
+    # file restaurants_suburbs.yml
+    mcdonalds = restaurants(:mcdonalds)
+    # check positive
+    suburb = mcdonalds.suburbs[0]
+    assert mcdonalds.suburbs.include?(suburb)
+    # check negative
+    suburb_with_no_mcdonalds = suburbs(:no_mcdonalds)
+    assert !mcdonalds.suburbs.include?(suburb_with_no_mcdonalds)
+  end
+
+  def test_include_cpk_owner_side_only
+    subway = restaurants(:subway_one)
+    product = products(:first_product)
+    subway.products << product
+
+    # reload
+    # test positive
+    subway = restaurants(:subway_one)
+    assert subway.products.include?(product)
+
+    # test negative
+    product_two = products(:second_product)
+    assert !subway.products.include?(product_two)
+  end
+
+  def test_include_cpk_association_side_only
+    product = products(:first_product)
+    subway = restaurants(:subway_one)
+    product.restaurants << subway
+    
+    # reload
+    # test positive
+    product = products(:first_product)
+    assert product.restaurants.include?(subway)
+
+    # test negative
+    mcdonalds = restaurants(:mcdonalds)
+    assert !product.restaurants.include?(mcdonalds)
+  end
+
   def test_habtm_clear_cpk_both_sides
     @restaurant = restaurants(:mcdonalds)
     assert_equal 2, @restaurant.suburbs.size

data/test/test_update.rb

@@ -35,4 +35,19 @@ class TestUpdate < ActiveSupport::TestCase
       end
     end
   end
+  
+  def test_update_primary_key
+    obj = ReferenceCode.find([1,1])
+    obj.reference_type_id = 2
+    obj.reference_code = 3
+    assert(obj.primary_key_changed?)
+    assert_equal({:reference_type_id => 1, :reference_code => 1}, obj.primary_key_was)
+    assert_equal({:reference_type_id => 2, :reference_code => 3}, obj.ids_hash)
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal(2, obj.reference_type_id)
+    assert_equal(3, obj.reference_code)
+    assert_equal({:reference_type_id => 2, :reference_code => 3}, obj.ids_hash)
+    assert_equal([2, 3], obj.id)
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 62196263
+  hash: 62196261
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - beta
-  - 2
-  version: 4.0.0.beta2
+  - 3
+  version: 4.0.0.beta3
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -73,6 +73,7 @@ files:
 - lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
+- lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/persistence.rb
 - lib/composite_primary_keys/relation/calculations.rb