composite_primary_keys 1.1.0 → 2.2.0

data/History.txt

@@ -1,3 +1,7 @@
+== 2.2.0 2008-10-29
+
+* Rails 2.2.0 compatibility
+
 == 1.1.0 2008-10-29
 
 * fixes to get cpk working for Rails 2.1.2

data/Rakefile

@@ -52,7 +52,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['activerecord', '>= 2.1.2']]  #An array of rubygem dependencies.
+  p.extra_deps = [['activerecord', '>= 2.2.0']]  #An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
 

data/lib/composite_primary_keys/association_preload.rb

@@ -10,7 +10,7 @@ module CompositePrimaryKeys
       module ClassMethods
         def preload_has_and_belongs_to_many_association(records, reflection, preload_options={})
           table_name = reflection.klass.quoted_table_name
-          id_to_record_map, ids = construct_id_map(records)
+          id_to_record_map, ids = construct_id_map_for_composite(records)
           records.each {|record| record.send(reflection.name).loaded}
           options = reflection.options
 
@@ -43,7 +43,7 @@ module CompositePrimaryKeys
         end
 
         def preload_has_many_association(records, reflection, preload_options={})
-          id_to_record_map, ids = construct_id_map(records)
+          id_to_record_map, ids = construct_id_map_for_composite(records)
           records.each {|record| record.send(reflection.name).loaded}
           options = reflection.options
 
@@ -219,6 +219,23 @@ module CompositePrimaryKeys
             :order      => preload_options[:order] || options[:order])
         end        
         
+        # Given a collection of ActiveRecord objects, constructs a Hash which maps
+        # the objects' IDs to the relevant objects. Returns a 2-tuple
+        # <tt>(id_to_record_map, ids)</tt> where +id_to_record_map+ is the Hash,
+        # and +ids+ is an Array of record IDs.
+        def construct_id_map_for_composite(records)
+          id_to_record_map = {}
+          ids = []
+          records.each do |record|
+            primary_key ||= record.class.primary_key
+            ids << record.id
+            mapped_records = (id_to_record_map[record.id.to_s] ||= [])
+            mapped_records << record
+          end
+          ids.uniq!
+          return id_to_record_map, ids
+        end
+        
         def full_composite_join_clause(reflection, table1, full_keys1, table2, full_keys2)
           connection = reflection.active_record.connection
           full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)

data/lib/composite_primary_keys/associations.rb

@@ -21,7 +21,7 @@ module CompositePrimaryKeys
           sql << " FROM #{quoted_table_name} "
           sql << join_dependency.join_associations.collect{|join| join.association_join }.join
 
-          add_joins!(sql, options, scope)
+          add_joins!(sql, options[:joins], scope)
           add_conditions!(sql, options[:conditions], scope)
           add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
 
@@ -39,7 +39,7 @@ module CompositePrimaryKeys
           sql = "SELECT #{column_aliases(join_dependency)} FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
           sql << join_dependency.join_associations.collect{|join| join.association_join }.join
 
-          add_joins!(sql, options, scope)
+          add_joins!(sql, options[:joins], scope)
           add_conditions!(sql, options[:conditions], scope)
           add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && options[:limit]
 

data/lib/composite_primary_keys/calculations.rb

@@ -35,7 +35,8 @@ module CompositePrimaryKeys
             join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins])
             sql << join_dependency.join_associations.collect{|join| join.association_join }.join
           end
-          add_joins!(sql, options, scope)
+
+          add_joins!(sql, options[:joins], scope)
           add_conditions!(sql, options[:conditions], scope)
           add_limited_ids_condition!(sql, options, join_dependency) if \
             join_dependency &&

data/lib/composite_primary_keys/version.rb

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

data/website/index.html

@@ -33,10 +33,10 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.1.0</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.2.0</a>
     </div>
-    <h1>&amp;#x2192; Ruby on Rails</h1>
-<h1>&amp;#x2192; ActiveRecords</h1>
+    <h1>&#8594; Ruby on Rails</h1>
+<h1>&#8594; ActiveRecords</h1>
 <h2>What</h2>
 <p>Ruby on Rails does not support composite primary keys. This free software is an extension <br />
 to the database layer of Rails &#8211; <a href="http://wiki.rubyonrails.com/rails/pages/ActiveRecord">ActiveRecords</a> &#8211; to support composite primary keys as transparently as possible.</p>
@@ -183,7 +183,7 @@ other stories and things.</p>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 25th October 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 29th October 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -1,8 +1,8 @@
 h1. Composite Primary Keys
 
-h1. → Ruby on Rails
+h1. -> Ruby on Rails
 
-h1. → ActiveRecords
+h1. -> ActiveRecords
 
 h2. What
 

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "1.1.0";
+var version = "2.2.0";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "1.1.0";
+var version = "2.2.0";
 
 document.write(" - " + version);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe