composite_primary_keys 5.0.10 → 5.0.11

data/History.rdoc

@@ -1,3 +1,10 @@
+== 5.0.11 2013-01-19
+* Patch HasManyAssociation foreign_key_present? method to work with array of keys (tbeauvais)
+* Patch reverse_sql_order method to break apart CPKs (tbeauvais)
+* Add test and fix for nested_attributes update (Dinshaw Gobhai)
+* Add test and fix for to_sym exception (Dinshaw Gobhai)
+* Add missing timestamp columns for mysql test_touch.rb (Dinshaw Gobhai)
+
 == 5.0.10 2012-11-21
 * ActiveRecord 3.2.9 compatability (Tom Hughes, Chris Heald, Jack Tang)
 * Add support for find_in_batches (Charlie Savage)

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -37,6 +37,12 @@ module ActiveRecord
           end
         end
       end
+
+      def foreign_key_present?
+        # CPK
+        # owner.attribute_present?(reflection.association_primary_key)
+        reflection.association_primary_key.all?{ |key| owner.attribute_present?(key) }
+      end
     end
   end
 end

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -1,24 +1,27 @@
-module CompositePrimaryKeys
-  module ActiveRecord
-    module QueryMethods
-      def reverse_order
-        order_clause = arel.order_clauses
+module CompositePrimaryKeys::ActiveRecord::QueryMethods
 
-        # CPK
-        # order = order_clause.empty? ?
-        #  "#{table_name}.#{primary_key} DESC" :
-        #  reverse_sql_order(order_clause).join(', ')
+  def reverse_sql_order(order_query)
+    # CPK
+    # order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
 
-        order = unless order_clause.empty?
-          reverse_sql_order(order_clause).join(', ')
-        else
-          klass.primary_key.map do |key|
-            "#{table_name}.#{key} DESC"
-          end.join(", ")
-        end
+    # break apart CPKs 
+    order_query = primary_key.map do |key|
+      "#{quoted_table_name}.#{connection.quote_column_name(key)} ASC"
+    end if order_query.empty?
 
-        except(:order).order(Arel.sql(order))
+    order_query.map do |o|
+      case o
+      when Arel::Nodes::Ordering
+        o.reverse
+      when String, Symbol
+        o.to_s.split(',').collect do |s|
+          s.strip!
+          s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
+        end
+      else
+        o
       end
-    end
+    end.flatten
   end
+
 end

data/lib/composite_primary_keys/sanitization.rb

@@ -1,15 +1,52 @@
 module ActiveRecord
   module Sanitization
-    def quoted_id
-      # CPK
-      #quote_value(id, column_for_attribute(self.class.primary_key))
-      if self.composite?
-        [self.class.primary_keys, ids].
-          transpose.
-          map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}
-      else
-        quote_value(id, column_for_attribute(self.class.primary_key))
+    module ClassMethods
+      protected
+      # Accepts a hash of SQL conditions and replaces those attributes
+      # that correspond to a +composed_of+ relationship with their expanded
+      # aggregate attribute values.
+      # Given:
+      #     class Person < ActiveRecord::Base
+      #       composed_of :address, class_name: "Address",
+      #         mapping: [%w(address_street street), %w(address_city city)]
+      #     end
+      # Then:
+      #     { address: Address.new("813 abc st.", "chicago") }
+      #       # => { address_street: "813 abc st.", address_city: "chicago" }
+      def expand_hash_conditions_for_aggregates(attrs)
+        expanded_attrs = {}
+        attrs.each do |attr, value|
+          if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
+            attr.each_with_index do |key,i|
+              expanded_attrs[key] = value.flatten[i]
+            end
+          elsif aggregation = reflect_on_aggregation(attr.to_sym)
+            mapping = aggregation.mapping
+            mapping.each do |field_attr, aggregate_attr|
+              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+                expanded_attrs[field_attr] = value
+              else
+                expanded_attrs[field_attr] = value.send(aggregate_attr)
+              end
+            end
+          else
+            expanded_attrs[attr] = value
+          end
+        end
+        expanded_attrs
+      end
+
+      def quoted_id
+        # CPK
+        #quote_value(id, column_for_attribute(self.class.primary_key))
+        if self.composite?
+          [self.class.primary_keys, ids].
+            transpose.
+            map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}
+        else
+          quote_value(id, column_for_attribute(self.class.primary_key))
+        end
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/mysql.sql

@@ -25,6 +25,8 @@ create table tariffs (
     tariff_id int not null,
     start_date date not null,
     amount integer(11) default null,
+    created_at timestamp,
+    updated_at timestamp,
     primary key (tariff_id, start_date)
 );
 

data/test/fixtures/reference_type.rb

@@ -1,7 +1,8 @@
 class ReferenceType < ActiveRecord::Base
   self.primary_key = :reference_type_id
   has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
-  
+  accepts_nested_attributes_for :reference_codes
+
   validates_presence_of :type_label, :abbreviation
   validates_uniqueness_of :type_label
 

data/test/test_associations.rb

@@ -269,4 +269,12 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end
+
+  def test_foreign_key_present_with_null_association_ids
+    group = Group.new
+    group.memberships.build
+    associations = group.association_cache[:memberships]
+    assert_equal(false, associations.send('foreign_key_present?'))
+  end
+
 end

data/test/test_nested_attributes.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestNestedAttributes < ActiveSupport::TestCase
+  fixtures :reference_types
+
+  def setup
+    @reference_type = ReferenceType.first
+  end
+
+  def test_nested_atttribute_create
+    code_id = 1001
+    @reference_type.update_attribute :reference_codes_attributes, [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
+  end
+
+  def test_nested_atttribute_update
+    code_id = 1002
+    @reference_type.update_attribute :reference_codes_attributes, [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    cpk = CompositePrimaryKeys::CompositeKeys[@reference_type.reference_type_id, code_id]
+    @reference_type.update_attribute :reference_codes_attributes, [{
+      :id => cpk,
+      :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')
+  end
+end

data/test/test_touch.rb

@@ -9,10 +9,10 @@ class TestTouch < ActiveSupport::TestCase
     tariff                = tariffs(:flat)
     previous_amount       = tariff.amount
     previously_updated_at = tariff.updated_at
-    
+
     tariff.amount         = previous_amount + 1
     tariff.touch
-
+    sleep 0.1
     assert_not_equal previously_updated_at, tariff.updated_at
     assert_equal previous_amount + 1, tariff.amount
     assert tariff.amount_changed?, 'tarif amount should have changed'

data/test/test_update.rb

@@ -2,30 +2,30 @@ require File.expand_path('../abstract_unit', __FILE__)
 
 class TestUpdate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
-  
+
   CLASSES = {
     :single => {
       :class => ReferenceType,
       :primary_keys => :reference_type_id,
       :update => { :description => 'RT Desc' },
     },
-    :dual   => { 
+    :dual   => {
       :class => ReferenceCode,
       :primary_keys => [:reference_type_id, :reference_code],
       :update => { :description => 'RT Desc' },
     },
   }
-  
+
   def setup
     self.class.classes = CLASSES
   end
-  
+
   def test_setup
     testing_with do
       assert_not_nil @klass_info[:update]
     end
   end
-  
+
   def test_update_attributes
     testing_with do
       assert(@first.update_attributes(@klass_info[:update]))
@@ -35,7 +35,7 @@ class TestUpdate < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def test_update_primary_key
     obj = ReferenceCode.find([1,1])
     obj.reference_type_id = 2
@@ -59,4 +59,14 @@ class TestUpdate < ActiveSupport::TestCase
     assert(obj.reload)
     assert_equal('b', obj.abbreviation)
   end
-end
+
+  def test_update_all
+    assert_nothing_raised do
+      refrence_code = ReferenceCode.create
+      primary_key = refrence_code.class.primary_key
+      ReferenceCode.update_all(
+        {description: 'random value'},
+        {primary_key => refrence_code[primary_key]})
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.10
+  version: 5.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,6 +183,7 @@ files:
 - test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
+- test/test_nested_attributes.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
@@ -237,6 +238,7 @@ test_files:
 - test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
+- test/test_nested_attributes.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb