composite_primary_keys 3.1.2 → 3.1.4

data/History.txt

@@ -1,3 +1,9 @@
+== 3.1.3 2011-03-05
+* Support ActiveRecord 3.0.5 (interpolate_sql was removed and
+  replaced by interpolate_and_sanitize_sql)
+* Fix persistence methods to support destroy callbacks
+
+
 == 3.1.2 2011-02-26
 * Add back in support for find('3,3') which makes it possible to
   do find(params[id]).  This implementation is simpler than earlier version

data/Rakefile

@@ -7,8 +7,8 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 
 # Set global variable so other tasks can access them
-PROJECT_ROOT = File.expand_path(".")
-GEM_NAME = 'composite_primary_keys'
+::PROJECT_ROOT = File.expand_path(".")
+::GEM_NAME = 'composite_primary_keys'
 
 # Read the spec file
 spec = Gem::Specification.load("#{GEM_NAME}.gemspec")

data/lib/composite_primary_keys.rb

@@ -44,6 +44,7 @@ require 'active_record/associations/has_many_association'
 require 'active_record/associations/has_one_association'
 require 'active_record/associations/has_one_through_association'
 require 'active_record/associations/through_association_scope'
+require 'active_record/persistence'
 require 'active_record/relation/query_methods'
 require 'active_record/attribute_methods/primary_key'
 require 'active_record/fixtures'
@@ -56,6 +57,7 @@ require 'composite_primary_keys/associations/has_many_association'
 require 'composite_primary_keys/associations/has_and_belongs_to_many_association'
 require 'composite_primary_keys/associations/through_association_scope'
 require 'composite_primary_keys/association_preload'
+require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/read'

data/lib/composite_primary_keys/associations.rb

@@ -35,8 +35,13 @@ module ActiveRecord
           def association_join
             return @join if @join
 
-            aliased_table = Arel::Table.new(table_name, :as => @aliased_table_name, :engine => arel_engine)
-            parent_table = Arel::Table.new(parent.table_name, :as => parent.aliased_table_name, :engine => arel_engine)
+            aliased_table = Arel::Table.new(table_name, :as      => @aliased_table_name,
+                                                        :engine  => arel_engine,
+                                                        :columns => klass.columns)
+
+            parent_table = Arel::Table.new(parent.table_name, :as      => parent.aliased_table_name,
+                                                              :engine  => arel_engine,
+                                                              :columns => parent.active_record.columns)
 
             @join = case reflection.macro
             when :has_and_belongs_to_many
@@ -51,14 +56,19 @@ module ActiveRecord
             when :has_many, :has_one
               if reflection.options[:through]
                 join_table = Arel::Table.new(through_reflection.klass.table_name, :as => aliased_join_table_name, :engine => arel_engine)
-                jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil
+                jt_as_extra = jt_source_extra = jt_sti_extra = nil
                 first_key = second_key = as_extra = nil
 
-                if through_reflection.options[:as] # has_many :through against a polymorphic join
-                  jt_foreign_key = through_reflection.options[:as].to_s + '_id'
-                  jt_as_extra = join_table[through_reflection.options[:as].to_s + '_type'].eq(parent.active_record.base_class.name)
+                if through_reflection.macro == :belongs_to
+                  jt_primary_key = through_reflection.primary_key_name
+                  jt_foreign_key = through_reflection.association_primary_key
                 else
+                  jt_primary_key = through_reflection.active_record_primary_key
                   jt_foreign_key = through_reflection.primary_key_name
+
+                  if through_reflection.options[:as] # has_many :through against a polymorphic join
+                    jt_as_extra = join_table[through_reflection.options[:as].to_s + '_type'].eq(parent.active_record.base_class.name)
+                  end
                 end
 
                 case source_reflection.macro
@@ -86,7 +96,7 @@ module ActiveRecord
                 end
 
                 [
-                  [parent_table[parent.primary_key].eq(join_table[jt_foreign_key]), jt_as_extra, jt_source_extra, jt_sti_extra].reject{|x| x.blank? },
+                  [parent_table[jt_primary_key].eq(join_table[jt_foreign_key]), jt_as_extra, jt_source_extra, jt_sti_extra].reject{|x| x.blank? },
                   aliased_table[first_key].eq(join_table[second_key])
                 ]
               elsif reflection.options[:as]
@@ -95,7 +105,6 @@ module ActiveRecord
                 [id_rel, type_rel]
               else
                 foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
-
                 # CPK
                 #[aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key])]
                 composite_join_predicates(aliased_table, foreign_key,
@@ -115,7 +124,7 @@ module ActiveRecord
 
             [through_reflection, reflection].each do |ref|
               if ref && ref.options[:conditions]
-                @join << interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))
+                @join << process_conditions(ref.options[:conditions], aliased_table_name)
               end
             end
 

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     class HasAndBelongsToManyAssociation
       def construct_sql
         if @reflection.options[:finder_sql]
-          @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
+          @finder_sql = interpolate_and_sanitize_sql(@reflection.options[:finder_sql])
         else
           # CPK
           # @finder_sql = "#{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{owner_quoted_id} "
@@ -36,7 +36,7 @@ module ActiveRecord
         end
 
         if @reflection.options[:insert_sql]
-          @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
+          @owner.connection.insert(interpolate_and_sanitize_sql(@reflection.options[:insert_sql], record))
         else
           relation   = Arel::Table.new(@reflection.options[:join_table])
           timestamps = record_timestamp_columns(record)

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       def construct_sql
         case
           when @reflection.options[:finder_sql]
-            @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
+            @finder_sql = interpolate_and_sanitize_sql(@reflection.options[:finder_sql])
 
           when @reflection.options[:as]
             @finder_sql =

data/lib/composite_primary_keys/base.rb

@@ -172,25 +172,6 @@ module ActiveRecord
           create_with.each { |att,value| self.send("#{att}=", value) } if create_with
         end
       end
-
-      def destroy
-        if persisted?
-          # CPK
-          # self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).delete_all
-          self.class.unscoped.where(ids_hash).delete_all
-        end
-
-        @destroyed = true
-        freeze
-      end
-
-      def update(attribute_names = @attributes.keys)
-        attributes_with_values = arel_attributes_values(false, false, attribute_names)
-        return 0 if attributes_with_values.empty?
-        # CPK
-        # self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).arel.update(attributes_with_values)
-        self.class.unscoped.where(ids_hash).arel.update(attributes_with_values)
-      end
     end
   end
 end

data/lib/composite_primary_keys/persistence.rb

@@ -0,0 +1,29 @@
+module ActiveRecord
+  module Persistence
+    def cpk_conditions
+      if self.composite?
+        ids_hash
+      else
+        self.class.arel_table[self.class.primary_key].eq(id)
+      end
+    end
+
+    def destroy
+      if persisted?
+        # self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).delete_all
+        self.class.unscoped.where(cpk_conditions).delete_all
+      end
+
+      @destroyed = true
+      freeze
+    end
+
+    def update(attribute_names = @attributes.keys)
+      attributes_with_values = arel_attributes_values(false, false, attribute_names)
+      return 0 if attributes_with_values.empty?
+      # CPK
+      # self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).arel.update(attributes_with_values)
+      self.class.unscoped.where(cpk_conditions).arel.update(attributes_with_values)
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/reference_type.rb

@@ -4,4 +4,9 @@ class ReferenceType < ActiveRecord::Base
   
   validates_presence_of :type_label, :abbreviation
   validates_uniqueness_of :type_label
+
+  before_destroy do |record|
+    a = record
+    puts a
+  end
 end

data/test/fixtures/room_assignment.rb

@@ -1,4 +1,12 @@
 class RoomAssignment < ActiveRecord::Base
   belongs_to :student
   belongs_to :room, :foreign_key => [:dorm_id, :room_id]
+
+  before_destroy do |record|
+    puts record
+  end
+
+  after_destroy do |record|
+    puts record
+  end
 end

data/test/fixtures/student.rb

@@ -1,4 +1,4 @@
 class Student < ActiveRecord::Base
-  has_many :room_assignments
+  has_many :room_assignments, :dependent => :destroy
   has_many :rooms, :through => :room_assignments, :foreign_key => [:building_code, :room_number]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 4
+  version: 3.1.4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 -07:00
+date: 2011-03-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 5
+        version: 3.0.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/finder_methods.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/persistence.rb
 - lib/composite_primary_keys/primary_key.rb
 - lib/composite_primary_keys/query_methods.rb
 - lib/composite_primary_keys/read.rb
@@ -100,7 +101,6 @@ files:
 - tasks/databases/oracle.rake
 - tasks/databases/postgresql.rake
 - tasks/databases/sqlite3.rake
-- tasks/Rakefile.rb
 - tasks/website.rake
 - test/abstract_unit.rb
 - test/connections/connection_spec.rb
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord

data/tasks/Rakefile.rb

@@ -1,13 +0,0 @@
-#require 'rake'
-#require 'rake/testtask'
-#
-#require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-#
-## Set up test tasks
-#for adapter in %w( mysql sqlite oracle oracle_enhanced postgresql ibm_db )
-#  Rake::TestTask.new("test_#{adapter}") do |t|
-#    t.libs << "test" << "test/connections/native_#{adapter}"
-#    t.pattern = "test/test_*.rb"
-#    t.verbose = true
-#  end
-#nd