composite_primary_keys 5.0.4 → 5.0.5

data/History.rdoc

@@ -1,3 +1,15 @@
+== 5.0.5 2012-05-05
+* Count without slower subquery in cases where that is possible (Sammy Larbi)
+* When you call association.build for a has_many association that uses a
+  composite foreign key, the newly built child record should have the values
+  in its belongs_to foreign_key populated from its owner's values (Tyler Rick).
+* Removed test_has_many_with_primary_key method that wasn't being used because
+  another method by the same name was defined below it (Tyler Rick).
+* Fixed a bug that was causing object.changes to raise TypeError (Tyler Rick)
+* Fix error when running rake mysql:rebuild_databases (Tyler Rick)
+* to_param should join with comma instead of minus sign (Tsutomu Kuroda)
+* Fix the "Factories" section of README.rdoc (Tsutomu Kuroda)
+
 == 5.0.4 2012-03-23
 * Update ActiveRecord::AttributeMethods#Write for Rails 3.2.2 (Travis Warlick)
 

data/README.rdoc

@@ -26,8 +26,10 @@ This RubyGem extends the activerecord gem to provide CPK support.
 
     FactoryGirl.define do
       factory :model_with_composite_keys do
-	      sequence( :id ) { |n| [n,Time.now] }
-	      name "Brett"
+        sequence( :id ) { |n| [n,Time.now] }
+        name "Brett"
+      end
+    end
 
 
 It even supports composite foreign keys for associations.

data/lib/composite_primary_keys/attribute_methods/dirty.rb

@@ -3,18 +3,21 @@ module ActiveRecord
     module Dirty
       def write_attribute(attr, value)
         # CPK
-        # attr = attr.to_s
-        attr = attr.to_s unless self.composite?
-
-        # The attribute already has an unsaved change.
-        if attribute_changed?(attr)
-          old = @changed_attributes[attr]
-          @changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+        if attr.kind_of?(Array)
+          # A *composite* attribute can't be marked as changed! So do nothing now.
+          # We will come back in here with an *individual* attribute when Write#write_attribute looks through the individual attributes comprising this composite key:
+          # [attr_name, value].transpose.map {|name,val| write_attribute(name, val)}
         else
-          old = clone_attribute_value(:read_attribute, attr)
-          # Save Time objects as TimeWithZone if time_zone_aware_attributes == true
-          old = old.in_time_zone if clone_with_time_zone_conversion_attribute?(attr, old)
-          @changed_attributes[attr] = old if field_changed?(attr, old, value)
+          # The attribute already has an unsaved change.
+          if attribute_changed?(attr)
+            old = @changed_attributes[attr]
+            @changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+          else
+            old = clone_attribute_value(:read_attribute, attr)
+            # Save Time objects as TimeWithZone if time_zone_aware_attributes == true
+            old = old.in_time_zone if clone_with_time_zone_conversion_attribute?(attr, old)
+            @changed_attributes[attr] = old if field_changed?(attr, old, value)
+          end
         end
 
         # Carry on.

data/lib/composite_primary_keys/base.rb

@@ -148,6 +148,10 @@ module ActiveRecord
       def to_key
         ids.to_a if !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
       end
+      
+      def to_param
+        persisted? ? to_key.join(CompositePrimaryKeys::ID_SEP) : nil
+      end
     end
   end
 end

data/lib/composite_primary_keys/relation.rb

@@ -8,7 +8,7 @@ module ActiveRecord
 
         def delete(id_or_array)
           ::ActiveRecord::IdentityMap.remove_by_id(self.symbolized_base_class, id_or_array) if ::ActiveRecord::IdentityMap.enabled?
-          # CPK
+          # Without CPK:
           # where(primary_key => id_or_array).delete_all
 
           id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
@@ -23,12 +23,13 @@ module ActiveRecord
         end
 
         def destroy(id_or_array)
-          # CPK
+          # Without CPK:
           #if id.is_a?(Array)
           #  id.map { |one_id| destroy(one_id) }
           #else
           #  find(id).destroy
           #end
+
           id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
             [id_or_array]
           else
@@ -44,16 +45,32 @@ module ActiveRecord
       end
     end
 
-    alias :initialize_cpk :initialize
+    def add_cpk_where_values_hash
+      class << self
+        def where_values_hash
+          # CPK adds this so that it finds the Equality nodes beneath the And node:
+          nodes_from_and = with_default_scope.where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
+
+          equalities = (nodes_from_and + with_default_scope.where_values.grep(Arel::Nodes::Equality)).find_all { |node|
+            node.left.relation.name == table_name
+          }
+
+          Hash[equalities.map { |where| [where.left.name, where.right] }]
+        end
+      end
+    end
+
+    alias :initialize_without_cpk :initialize
     def initialize(klass, table)
-      initialize_cpk(klass, table)
+      initialize_without_cpk(klass, table)
       add_cpk_support if klass.composite?
+      add_cpk_where_values_hash
     end
 
-    alias :initialize_copy_cpk :initialize_copy
+    alias :initialize_copy_without_cpk :initialize_copy
     def initialize_copy(other)
-      initialize_copy_cpk(other)
+      initialize_copy_without_cpk(other)
       add_cpk_support if klass.composite?
     end
   end
-end
+end

data/lib/composite_primary_keys/relation/calculations.rb

@@ -55,8 +55,17 @@ module CompositePrimaryKeys
           else
             [Arel.sql(column_name == :all ? "#{@klass.quoted_table_name}.*" : column_name.to_s)]
           end
-
-
+        
+        # do not use slower subquery if we're only counting on one column
+        if relation.select_values.count == 1
+          # exclude distinct table_name.* in case of joins where subbing * would change results
+          if (!distinct && column_name == :all) || column_name != :all
+            column = relation.select_values[0].gsub("#{@klass.quoted_table_name}.","")
+            relation.select_values = [operation_over_aggregate_column(column, 'count', distinct)]
+            return relation.arel
+          end
+        end
+        
         relation.distinct(true)
         subquery = relation.arel.as(subquery_alias)
 

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/mysql.rake

@@ -19,7 +19,9 @@ namespace :mysql do
       file.read
     end
 
+    Rake::Task['mysql:load_connection'].reenable
     Rake::Task['mysql:load_connection'].invoke
+    #puts %(ActiveRecord::Base.connection.instance_variable_get(:@config)=#{(ActiveRecord::Base.connection.instance_variable_get(:@config)).inspect})
     ActiveRecord::Base.connection.execute(sql)
   end
 
@@ -33,5 +35,6 @@ namespace :mysql do
   
   task :load_connection do
     require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
+    establish_connection
   end
-end
+end

data/test/connections/native_mysql/connection.rb

@@ -8,6 +8,10 @@ def connection_string
   options.map { |key, value| "-#{key}#{value}" }.join(" ")
 end
 
-# Adapter config setup in text/connections/databases.yml
+# Adapter config setup in test/connections/databases.yml
 SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
-ActiveRecord::Base.establish_connection(SPEC)
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(SPEC)
+end
+establish_connection

data/test/test_associations.rb

@@ -162,9 +162,18 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(rooms(:branner_room_1), room_assignment.room)
   end
 
-  def test_has_many_with_primary_key
-    @membership = Membership.find([1, 1])
-    assert_equal 2, @membership.reading.id
+  def test_composite_belongs_to_changes
+    room_assignment = room_assignments(:jacksons_room)
+    room_assignment.room = rooms(:branner_room_2)
+    # This was raising an error before:
+    #   TypeError: [:dorm_id, :room_id] is not a symbol
+    assert_equal({:room_id=>[1, 2]}, room_assignment.changes)
+
+    steve = employees(:steve)
+    steve.department = departments(:engineering)
+    # It was returning this before:
+    #   {"[:department_id, :location_id]"=>[nil, [2, 1]]}
+    assert_equal({:department_id=>[1, 2]}, steve.changes)
   end
 
   def test_has_one_with_composite
@@ -173,14 +182,28 @@ class TestAssociations < ActiveSupport::TestCase
     assert_not_nil(department.head)
   end
 
+  def test_has_many_build__simple_key
+    user = users(:santiago)
+    reading = user.readings.build
+    assert_equal user.id, reading.user_id
+    assert_equal user,    reading.user
+  end
+
+  def test_has_many_build__composite_key
+    department = departments(:engineering)
+    employee = department.employees.build
+    assert_equal department.department_id, employee.department_id
+    assert_equal department.location_id,   employee.location_id
+    assert_equal department,               employee.department
+  end
+
   def test_has_many_with_primary_key
     @membership = Membership.find([1, 1])
-
     assert_equal 2, @membership.readings.size
   end
 
   def test_has_many_with_composite_key
-    # In this case a regular model has_many composite models
+    # In this case a regular model (Dorm) has_many composite models (Rooms)
     dorm = dorms(:branner)
     assert_equal(2, dorm.rooms.length)
     assert_equal(1, dorm.rooms[0].room_id)
@@ -238,4 +261,4 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end
-end
+end

data/test/test_composite_arrays.rb

@@ -21,11 +21,4 @@ class CompositeArraysTest < ActiveSupport::TestCase
     assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
     assert_equal '1,2,3', keys.to_s
   end
-
-  def test_composite_keys_equality
-    keys_array_1 = [1, Time.now].to_composite_keys
-    keys_array_2 = [1, Time.now].to_composite_keys
-    assert keys_array_1 == keys_array_2
-    assert keys_array_1.eql? keys_array_2
-  end
-end
+end

data/test/test_ids.rb

@@ -32,6 +32,12 @@ class TestIds < ActiveSupport::TestCase
     end
   end
 
+  def test_to_param
+    testing_with do
+      assert_equal '1,1', @first.to_param if composite?
+    end
+  end
+
   def test_ids_to_s
     testing_with do
       order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord