composite_primary_keys 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.2 2008-06-07
+
+* fix for has many through when through association has composite keys
+
 == 1.0.1 2008-06-06
 
 * Oracle fixes

data/lib/composite_primary_keys/association_preload.rb

@@ -57,7 +57,8 @@ module CompositePrimaryKeys
               #add conditions from reflection!
               through_records.first.class.preload_associations(through_records, source, reflection.options)
               through_records.each do |through_record|
-                add_preloaded_records_to_collection(id_to_record_map[through_record[through_primary_key].to_s], reflection.name, through_record.send(source))
+                key = through_primary_key.to_s.split(CompositePrimaryKeys::ID_SEP).map{|k| through_record.send(k)}.join(CompositePrimaryKeys::ID_SEP)
+                add_preloaded_records_to_collection(id_to_record_map[key], reflection.name, through_record.send(source))
               end
             end
           else 

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/mysql.sql

@@ -135,4 +135,27 @@ create table restaurants_suburbs (
 	store_id int(11) not null,
 	city_id int(11) not null,
 	suburb_id int(11) not null
+) TYPE=InnoDB;
+
+create table dorms (
+	id int(11) not null auto_increment,
+	primary key(id)
+) TYPE=InnoDB;
+
+create table rooms (
+	dorm_id int(11) not null,
+	room_id int(11) not null,
+	primary key (dorm_id, room_id)
+) TYPE=InnoDB;
+
+create table room_attributes (
+	id int(11) not null auto_increment,
+	name varchar(50),
+	primary key(id)
+) TYPE=InnoDB;
+
+create table room_attribute_assignments (
+	dorm_id int(11) not null,
+	room_id int(11) not null,
+	room_attribute_id integer not null
 ) TYPE=InnoDB;

data/test/fixtures/db_definitions/sqlite.sql

@@ -124,4 +124,25 @@ create table restaurants_suburbs (
 	store_id integer not null,
 	city_id integer not null,
 	suburb_id integer not null
-);
+);
+
+create table dorms (
+	id integer not null primary key autoincrement
+);
+
+create table rooms (
+	dorm_id integer not null,
+	room_id integer not null,
+	primary key (dorm_id, room_id)
+);
+
+create table room_attributes (
+	id integer not null primary key autoincrement,
+	name varchar(50)
+);
+
+create table room_attribute_assignments (
+	dorm_id integer not null,
+	room_id integer not null,
+	room_attribute_id integer not null
+);

data/test/test_associations.rb

@@ -5,9 +5,14 @@ require 'fixtures/product_tariff'
 require 'fixtures/suburb'
 require 'fixtures/street'
 require 'fixtures/restaurant'
+require 'fixtures/dorm'
+require 'fixtures/room'
+require 'fixtures/room_attribute'
+require 'fixtures/room_attribute_assignment'
 
 class TestAssociations < Test::Unit::TestCase
-  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs
+  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments
   
   def test_quoted_table_columns
     assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 
@@ -94,6 +99,13 @@ class TestAssociations < Test::Unit::TestCase
     assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@tariffs').length},
       "Incorrect number of tariffs returned"
   end
+  
+  def test_has_many_through_when_through_association_is_composite
+    dorm = Dorm.find(:first)
+    assert_equal 1, dorm.rooms.length
+    assert_equal 1, dorm.rooms.first.room_attributes.length
+    assert_equal 'keg', dorm.rooms.first.room_attributes.first.name
+  end
 
   def test_associations_with_conditions
     @suburb = Suburb.find([2, 1])

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.1</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.2</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 

data/website/version-raw.js

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

data/website/version.js

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

metadata

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