composite_primary_keys 5.0.14 → 6.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6d742f5b3aa47b253ff251f23022e7341a295323
-  data.tar.gz: 784a15040a16aa863c8a663023597bcbd3ae0ca2
-SHA512:
-  metadata.gz: dc637cd61e831a0b0f9bb7e227d68ca8e4c6d7b9860e1d795824a15b0da908f896b914fadd6070cf789885b3249d15e9dfaae73498c2ae5278d34d86148b09cd
-  data.tar.gz: 24fb04075dddee84c31aa8a43fcbabf1973384c512837f98dd7912a7472d9bf4c6f85b24a02adf5288c083b83b43a1ab0b54de5bb508880a8caef491ba2863ca
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTg5ODVmZTc1ZThmM2U1Y2Q1OTllMDM1MGNhMGZiNTk5ZTc0ZWIwMg==
+  data.tar.gz: !binary |-
+    MDg4MjRkMzllODdmNTIwMjE3YTk4OTlmNDgyYzdlNmIxYmEyNDY2YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmYzM2E0YWY5MTY2ZWY0YTc3NGYwMmY0NDIxZjc4ODgzMzFmZmQyOTljNjQ5
+    NmNmYTZmNzJmZjkxMzMzMDgxNzU3NTE1MWZlMmU0Mjk4MTlkN2RjNDQ1NzIy
+    NTdlZDZjNjI5NTU3MWUxNmM5NTdlZjZiNTk4NzQ0MzNiNWVjNDY=
+  data.tar.gz: !binary |-
+    YTU3N2Y3YWM3N2I1OGMzNmE5NmI0ZDljNTgwNzRmYzQ2Nzg1YzdhM2E0MWI4
+    OGY5NzUzNWUyNzZkOGU2MjgzOTM2MmMzYTAyYTkxYmJjMTM0NzZlNjViMDg2
+    NjQ1NGUxNTI2ODFhZjVjYzk2YjNhYzg3OGYxNzMzZjczNjIzZGE=

data/History.rdoc

@@ -1,15 +1,9 @@
-== 5.0.14 2013-03-16
-* Raise error on destroy when no pk is set (Manuel Kniep)
-* Fix bug where object == object returns false for new instances of a CPK model,
-  even though object.equal?(object) is true (Tyler Rick)
-* Instead of the generic message "Number of attr_names and values do not match", give
-  specifics that would aid in debugging (Tyler Rick)
-* Improve equality, ==, implmentation (Joe Goggins)
+== 6.0.0 (2013-08-04)
+* ActiveRecord 4.0 support (Sammy Larbi)
 
 == 5.0.13 2013-04-27
 * Batch query improvements (Jordan Byron)
 * Support nested attributes (aiasfina and Charlie Savage)
-* ActiveRecord 4.0 support in ar_4.0.x branch
 
 == 5.0.12 2013-01-21
 * Fix HasManyAssociation foreign_key_present? method to work with non CPK assocations (Charlie Savage)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '>= 3.2.9', '~> 3.2.0'
+  gem 'activerecord', '4.0.0'
   require 'active_record'
 end
 
@@ -66,12 +66,12 @@ require 'active_record/validations/uniqueness'
 
 
 # CPK files
+require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
+require 'composite_primary_keys/core'
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/composite_predicates'
-require 'composite_primary_keys/counter_cache'
 require 'composite_primary_keys/fixtures'
-require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/sanitization'
 require 'composite_primary_keys/version'

data/lib/composite_primary_keys/associations/association.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       def creation_attributes
         attributes = {}
 
-        if reflection.macro.in?([:has_one, :has_many]) && !options[:through]
+        if (reflection.macro == :has_one || reflection.macro == :has_many) && !options[:through]
           # CPK
           # attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
           Array(reflection.foreign_key).zip(Array(reflection.active_record_primary_key)).each do |key1, key2|

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -25,7 +25,7 @@ module ActiveRecord
 
           if reflection.source_macro == :belongs_to
             if reflection.options[:polymorphic]
-              key = reflection.association_primary_key(klass)
+              key = reflection.association_primary_key(self.klass)
             else
               key = reflection.association_primary_key
             end
@@ -36,8 +36,7 @@ module ActiveRecord
             foreign_key = reflection.active_record_primary_key
           end
 
-          conditions = self.conditions[i]
-
+          
           if reflection == chain.last
             # CPK
             # scope = scope.where(table[key].eq(owner[foreign_key]))
@@ -47,14 +46,6 @@ module ActiveRecord
             if reflection.type
               scope = scope.where(table[reflection.type].eq(owner.class.base_class.name))
             end
-
-            conditions.each do |condition|
-              if options[:through] && condition.is_a?(Hash)
-                condition = { table.name => condition }
-              end
-
-              scope = scope.where(interpolate(condition))
-            end
           else
             # CPK
             # constraint = table[key].eq(foreign_table[foreign_key])
@@ -66,10 +57,18 @@ module ActiveRecord
             end
 
             scope = scope.joins(join(foreign_table, constraint))
+          end
+          
+          scope_chain[i].each do |scope_chain_item|
+            klass = i == 0 ? self.klass : reflection.klass
+            item  = eval_scope(klass, scope_chain_item)
 
-            unless conditions.empty?
-              scope = scope.where(sanitize(conditions, table))
+            if scope_chain_item == self.reflection.scope
+              scope.merge! item.except(:where, :includes)
             end
+
+            scope.includes! item.includes_values
+            scope.where_values += item.where_values
           end
         end
 

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -11,7 +11,7 @@ module ActiveRecord
         end
 
         if options[:insert_sql]
-          owner.connection.insert(interpolate(options[:insert_sql], record))
+          owner.class.connection.insert(interpolate(options[:insert_sql], record))
         else
           # CPK
           #stmt = join_table.compile_insert(
@@ -31,7 +31,7 @@ module ActiveRecord
 
           stmt = join_table.compile_insert(join_values)
 
-          owner.connection.insert stmt.to_sql
+          owner.class.connection.insert stmt.to_sql
         end
 
         record
@@ -39,7 +39,7 @@ module ActiveRecord
 
       def delete_records(records, method)
         if sql = options[:delete_sql]
-          records.each { |record| owner.connection.delete(interpolate(sql, record)) }
+          records.each { |record| owner.class.connection.delete(interpolate(sql, record)) }
         else
           relation = join_table
           # CPK
@@ -51,7 +51,7 @@ module ActiveRecord
           predicate2 = cpk_in_predicate(relation, Array(reflection.association_foreign_key), records.map { |x| x.id }) unless records == :all
           stmt = relation.where(predicate1.and(predicate2)).compile_delete
 
-          owner.connection.delete stmt.to_sql
+          owner.class.connection.delete stmt.to_sql
         end
       end
     end    

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -8,7 +8,7 @@ module ActiveRecord
         else
           # CPK
           # keys  = records.map { |r| r[reflection.association_primary_key] }
-          # scope = scoped.where(reflection.association_primary_key => keys)
+          # scope = scope.where(reflection.association_primary_key => keys)
           table = Arel::Table.new(reflection.table_name)
           and_conditions = records.map do |record|
             eq_conditions = Array(reflection.association_primary_key).map do |name|
@@ -22,7 +22,7 @@ module ActiveRecord
             condition = condition.or(and_condition)
           end
 
-          scope = scoped.where(condition)
+          scope = scope.where(condition)
 
           if method == :delete_all
             update_counter(-scope.delete_all)

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -18,7 +18,7 @@ module ActiveRecord
           parent
         }.uniq
 
-        remove_duplicate_results!(active_record, records, @associations)
+        remove_duplicate_results!(base_klass, records, @associations)
         records
       end
 

data/lib/composite_primary_keys/associations/join_dependency/join_part.rb

@@ -6,7 +6,7 @@ module ActiveRecord
           # CPK
           # "#{aliased_prefix}_r0"
 
-          active_record.composite? ?
+          base_klass.composite? ?
             primary_key.inject([]) {|aliased_keys, key| aliased_keys << "#{ aliased_prefix }_r#{aliased_keys.length}"} :
             "#{ aliased_prefix }_r0"
         end
@@ -14,7 +14,7 @@ module ActiveRecord
         def record_id(row)
           # CPK
           # row[aliased_primary_key]
-          active_record.composite? ?
+          base_klass.composite? ?
             aliased_primary_key.map {|key| row[key]}.to_composite_keys :
             row[aliased_primary_key]
         end
@@ -25,7 +25,7 @@ module ActiveRecord
 
             # CPK
             #([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
-            keys = active_record.composite? ? primary_key.map(&:to_s) : [primary_key]
+            keys = base_klass.composite? ? primary_key.map(&:to_s) : [primary_key]
 
             (keys + (column_names - keys)).each_with_index do |column_name, i|
               @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -4,9 +4,9 @@ module ActiveRecord
       class Association
         def records_for(ids)
           # CPK
-          # scoped.where(association_key.in(ids))
+          # scope.where(association_key.in(ids))
           predicate = cpk_in_predicate(table, reflection.foreign_key, ids)
-          scoped.where(predicate)
+          scope.where(predicate)
         end
         
         def associated_records_by_owner

data/lib/composite_primary_keys/associations/preloader/belongs_to.rb

@@ -5,7 +5,7 @@ module ActiveRecord
         def records_for(ids)
           # CPK
           predicate = cpk_in_predicate(table, association_key_name, ids)
-          scoped.where(predicate)
+          scope.where(predicate)
         end
       end
     end

data/lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb

@@ -4,9 +4,9 @@ module ActiveRecord
       class HasAndBelongsToMany
         def records_for(ids)
           # CPK
-          #scope = super
+          # scope = super
           predicate = cpk_in_predicate(join_table, reflection.foreign_key, ids)
-          scope = scoped.where(predicate)
+          scope = build_scope.where(predicate)
 
           klass.connection.select_all(scope.arel.to_sql, 'SQL', scope.bind_values)
         end

data/lib/composite_primary_keys/attribute_methods/dirty.rb

@@ -16,8 +16,6 @@ module ActiveRecord
             @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

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -25,12 +25,12 @@ module ActiveRecord
         end
       end
 
-      def read_attribute(attr_name)
-        # CPK
+      rails_read_attribute = instance_method(:read_attribute)
+      define_method(:read_attribute) do |attr_name|
         if attr_name.kind_of?(Array)
           attr_name.map {|name| read_attribute(name)}.to_composite_keys
         else
-          self.class.type_cast_attribute(attr_name, @attributes, @attributes_cache)
+          rails_read_attribute.bind(self).(attr_name)
         end
       end
     end

data/lib/composite_primary_keys/base.rb

@@ -3,6 +3,8 @@ module ActiveRecord
   end
 
   class Base
+    include CompositePrimaryKeys::ActiveRecord::Persistence
+    
     INVALID_FOR_COMPOSITE_KEYS = 'Not appropriate for composite primary keys'
     NOT_IMPLEMENTED_YET        = 'Not implemented for composite primary keys yet'
 
@@ -57,32 +59,6 @@ module ActiveRecord
       self.class.composite?
     end
 
-    def initialize_dup(other)
-      cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
-      self.class.initialize_attributes(cloned_attributes, :serialized => false)
-      # CPK
-      # cloned_attributes.delete(self.class.primary_key)
-      Array(self.class.primary_key).each {|key| cloned_attributes.delete(key.to_s)}
-
-      @attributes = cloned_attributes
-
-      _run_after_initialize_callbacks if respond_to?(:_run_after_initialize_callbacks)
-
-      @changed_attributes = {}
-      self.class.column_defaults.each do |attr, orig_value|
-        @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
-      end
-
-      @aggregation_cache = {}
-      @association_cache = {}
-      @attributes_cache = {}
-      @new_record  = true
-
-      ensure_proper_type
-      populate_with_current_scope_attributes
-      super
-    end
-
     module CompositeClassMethods
       def primary_key
         primary_keys
@@ -137,7 +113,7 @@ module ActiveRecord
 
       def ==(comparison_object)
         return true if equal? comparison_object
-        ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| !id.nil?} : super(comparison_object)
+        ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| id.present?} : super(comparison_object)
       end
 
       def can_change_primary_key_values?

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

@@ -7,7 +7,7 @@ module ActiveRecord
     end
     
     def self.establish_connection(spec = ENV["DATABASE_URL"])
-      resolver = ConnectionSpecification::Resolver.new spec, configurations
+      resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new spec, configurations
       spec = resolver.spec
       
       # CPK
@@ -18,7 +18,7 @@ module ActiveRecord
       end
 
       remove_connection
-      connection_handler.establish_connection name, spec
+      connection_handler.establish_connection self, spec
     end
 
     class << self

data/lib/composite_primary_keys/core.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module Core
+    def initialize_dup(other)
+      cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+      self.class.initialize_attributes(cloned_attributes, :serialized => false)
+      # CPK
+      # cloned_attributes.delete(self.class.primary_key)
+      Array(self.class.primary_key).each {|key| cloned_attributes.delete(key.to_s)}
+      @attributes = cloned_attributes
+      
+      run_callbacks(:initialize) unless _initialize_callbacks.empty?
+
+      @changed_attributes = {}
+      self.class.column_defaults.each do |attr, orig_value|
+        @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
+      end
+
+      @aggregation_cache = {}
+      @association_cache = {}
+      @attributes_cache  = {}
+
+      @new_record  = true
+
+      ensure_proper_type
+      super
+    end
+  end
+end

data/lib/composite_primary_keys/persistence.rb

@@ -1,15 +1,9 @@
-module ActiveRecord
-  module Persistence
-    def destroy
-      destroy_associations
-
-      if persisted?
-        IdentityMap.remove(self) if IdentityMap.enabled?
-        # CPK
-        #pk         = self.class.primary_key
-        #column     = self.class.columns_hash[pk]
-        #substitute = connection.substitute_at(column, 0)
-
+module CompositePrimaryKeys
+  module ActiveRecord
+    module Persistence
+      def relation_for_destroy
+        return super unless composite?
+        
         where_hash = {}
         primary_keys = Array(self.class.primary_key)
 
@@ -17,59 +11,47 @@ module ActiveRecord
           raise ActiveRecord::CompositeKeyError, "No primary key(s) defined for #{self.class.name}"
         end
 
-        #relation = self.class.unscoped.where(
-        #  self.class.arel_table[pk].eq(substitute))
-
         primary_keys.each do |key|
           where_hash[key.to_s] = self[key]
         end
 
-        # CPK      
-        #relation.bind_values = [[column, id]]
-
         relation = self.class.unscoped.where(where_hash)
-        relation.delete_all
       end
+      
 
-      @destroyed = true
-      freeze
-    end
-
-    def touch(name = nil)
-      attributes = timestamp_attributes_for_update_in_model
-      attributes << name if name
+      def touch(name = nil)
+        attributes = timestamp_attributes_for_update_in_model
+        attributes << name if name
 
-      unless attributes.empty?
-        current_time = current_time_from_proper_timezone
-        changes = {}
+        unless attributes.empty?
+          current_time = current_time_from_proper_timezone
+          changes = {}
 
-        attributes.each do |column|
-          column = column.to_s
-          changes[column] = write_attribute(column, current_time)
-        end
+          attributes.each do |column|
+            column = column.to_s
+            changes[column] = write_attribute(column, current_time)
+          end
 
-        changes[self.class.locking_column] = increment_lock if locking_enabled?
+          changes[self.class.locking_column] = increment_lock if locking_enabled?
 
-        @changed_attributes.except!(*changes.keys)
+          @changed_attributes.except!(*changes.keys)
 
-        relation    = self.class.send(:relation)
-        arel_table  = self.class.arel_table
-        primary_key = self.class.primary_key
+          relation    = self.class.send(:relation)
+          arel_table  = self.class.arel_table
+          primary_key = self.class.primary_key
 
-        primary_key_predicate = relation.cpk_id_predicate(arel_table, Array(primary_key), Array(id))
+          primary_key_predicate = relation.cpk_id_predicate(arel_table, Array(primary_key), Array(id))
 
-        self.class.unscoped.where(primary_key_predicate).update_all(changes) == 1
+          self.class.unscoped.where(primary_key_predicate).update_all(changes) == 1
+        end
       end
-    end
 
-    def update(attribute_names = @attributes.keys)
-      klass = self.class
-      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
-        attributes_with_values = arel_attributes_values(can_change_primary_key?, false, attribute_names)
+      def update_record(attribute_names = @attributes.keys)
+        return super(attribute_names) unless composite?
+        
+        klass = self.class
+        
+        attributes_with_values = arel_attributes_with_values_for_update(attribute_names)
         return 0 if attributes_with_values.empty?
 
         if !can_change_primary_key? and primary_key_changed?
@@ -79,8 +61,9 @@ module ActiveRecord
         else
           stmt = klass.unscoped.where(ids_hash).arel.compile_update(attributes_with_values)
         end
+        
+        klass.connection.update stmt.to_sql
       end
-      klass.connection.update stmt.to_sql
     end
   end
 end