composite_primary_keys 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.1 2008-06-06
+
+* Oracle fixes
+
 == 1.0.0 2008-06-05
 
 * Support for Rails 2.1

data/lib/composite_primary_keys/association_preload.rb

@@ -21,12 +21,12 @@ module CompositePrimaryKeys
             end.join(" OR ")
             
             conditions = [where, ids].flatten
-            joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} as t0 ON #{full_composite_join_clause(reflection.klass.quoted_table_name, reflection.klass.primary_key, 't0', reflection.association_foreign_key)}"
+            joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{full_composite_join_clause(reflection.klass.quoted_table_name, reflection.klass.primary_key, 't0', reflection.association_foreign_key)}"
             parent_primary_keys = reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).map{|k| "t0.#{k}"}
             parent_record_id = connection.concat(parent_primary_keys.zip(["','"] * (parent_primary_keys.size - 1)).flatten.compact)
           else
             conditions = ["t0.#{reflection.primary_key_name}  IN (?)", ids]
-            joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} as t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}"
+            joins = "INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}"
             parent_record_id = reflection.primary_key_name
           end
           
@@ -36,10 +36,10 @@ module CompositePrimaryKeys
             :conditions => conditions,
             :include => options[:include],
             :joins => joins,
-            :select => "#{options[:select] || table_name+'.*'}, #{parent_record_id} as _parent_record_id",
+            :select => "#{options[:select] || table_name+'.*'}, #{parent_record_id} as parent_record_id_",
             :order => options[:order])
             
-          set_association_collection_records(id_to_record_map, reflection.name, associated_records, '_parent_record_id')
+          set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'parent_record_id_')
         end
                 
         def preload_has_many_association(records, reflection, preload_options={})
@@ -106,14 +106,23 @@ module CompositePrimaryKeys
           if options[:polymorphic]
             raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
           else
+          	# I need to keep the original ids for each record (as opposed to the stringified) so
+          	# that they get properly converted for each db so the id_map ends up looking like:
+          	#
+          	# { '1,2' => {:id => [1,2], :records => [...records...]}}
             id_map = {}
+            
             records.each do |record|
-              key = primary_key_name.map{|k| record.send(k)}.join(CompositePrimaryKeys::ID_SEP)
-              if key
-                mapped_records = (id_map[key.to_s] ||= [])
-                mapped_records << record
+              key = primary_key_name.map{|k| record.send(k)}
+              key_as_string = key.join(CompositePrimaryKeys::ID_SEP)
+              
+              if key_as_string
+                mapped_records = (id_map[key_as_string] ||= {:id => key, :records => []})
+                mapped_records[:records] << record
               end
             end
+            
+            
             klasses_and_ids = [[reflection.klass.name, id_map]]
           end
 
@@ -124,7 +133,7 @@ module CompositePrimaryKeys
             
             if(composite?)
               primary_key = klass.primary_key.to_s.split(CompositePrimaryKeys::ID_SEP)
-              ids = id_map.keys.uniq.map {|id| id.to_s.split(CompositePrimaryKeys::ID_SEP)}
+              ids = id_map.keys.uniq.map {|id| id_map[id][:id]}
 
               where = (primary_key * ids.size).in_groups_of(primary_key.size).map do |keys|
                  "(" + keys.map{|key| "#{table_name}.#{key} = ?"}.join(" AND ") + ")"
@@ -167,7 +176,7 @@ module CompositePrimaryKeys
             # only one row per distinct foo_id' so this where we enforce that
             next if seen_keys[associated_record_key]
             seen_keys[associated_record_key] = true
-            mapped_records = id_to_record_map[associated_record_key]
+            mapped_records = id_to_record_map[associated_record_key][:records]
             mapped_records.each do |mapped_record|
               mapped_record.send("set_#{reflection_name}_target", associated_record)
             end

data/lib/composite_primary_keys/version.rb

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

data/website/index.html

@@ -33,7 +33,7 @@
     <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.0.0</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.1</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -296,7 +296,7 @@ other stories and things.</p>
 
 	<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>, 5th June 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 6th June 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-05 00:00:00 -05:00
+date: 2008-06-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency