composite_primary_keys 0.9.91 → 0.9.92

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.92 2008-02-22
+
+* Support for has_and_belongs_to_many
+
 == 0.9.91 2008-01-27
 
 * Incremented activerecord dependency to 2.0.2 [thx emmanuel.pirsch]

data/lib/composite_primary_keys/associations.rb

@@ -251,6 +251,15 @@ module ActiveRecord::Associations
       "(#{where_clause})"
     end
 
+    def full_composite_join_clause(table1, full_keys1, table2, full_keys2)
+      full_keys1 = full_keys1.split(CompositePrimaryKeys::ID_SEP) if full_keys1.is_a?(String)
+      full_keys2 = full_keys2.split(CompositePrimaryKeys::ID_SEP) if full_keys2.is_a?(String)
+      where_clause = [full_keys1, full_keys2].transpose.map do |key_pair|
+        "#{table1}.#{key_pair.first}=#{table2}.#{key_pair.last}"
+      end.join(" AND ")
+      "(#{where_clause})"
+    end
+    
     def full_keys(table_name, keys)
       keys = keys.split(CompositePrimaryKeys::ID_SEP) if keys.is_a?(String)
       keys.is_a?(Array) ?
@@ -269,6 +278,25 @@ module ActiveRecord::Associations
     end  
   end
 
+  class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
+    def construct_sql
+      interpolate_sql_options!(@reflection.options, :finder_sql)
+
+      if @reflection.options[:finder_sql]
+        @finder_sql = @reflection.options[:finder_sql]
+      else
+        @finder_sql = full_columns_equals(  
+          @reflection.options[:join_table],
+          @reflection.primary_key_name, 
+          @owner.quoted_id)
+        @finder_sql << " AND (#{conditions})" if conditions
+      end
+
+      @join_sql = "INNER JOIN #{@reflection.options[:join_table]} ON " +
+      full_composite_join_clause(@reflection.klass.table_name, @reflection.klass.primary_key, @reflection.options[:join_table], @reflection.association_foreign_key)
+    end    
+  end
+  
   class HasManyAssociation < AssociationCollection #:nodoc:
     def construct_sql
       case

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -97,3 +97,17 @@ create table kitchen_sinks (
 	a_string varchar(100),
 	primary key (id_1, id_2)
 );
+
+create table restaurants (
+	franchise_id integer not null,
+	store_id integer not null,
+	name varchar(100),
+	primary key (franchise_id, store_id)
+);
+
+create table restaurants_suburbs (
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
+);

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -12,3 +12,5 @@ drop table USERS;
 drop table SUBURBS;                                                                                                                         
 drop table PRODUCT_TARIFFS; 
 drop table KITCHEN_SINK;
+drop table RESTAURANTS;
+drop table RESTAURANTS_SUBURBS;

data/test/fixtures/db_definitions/mysql.sql

@@ -121,4 +121,18 @@ create table kitchen_sinks (
 	a_date date,
 	a_string varchar(100),
 	primary key (id_1, id_2)
-) TYPE=InnoDB
+) TYPE=InnoDB;
+
+create table restaurants (
+	franchise_id int(11) not null,
+	store_id int(11) not null,
+	name varchar(100),
+	primary key (franchise_id, store_id)
+) TYPE=InnoDB;
+
+create table restaurants_suburbs (
+	franchise_id int(11) not null,
+	store_id int(11) not null,
+	city_id int(11) not null,
+	suburb_id int(11) not null
+) TYPE=InnoDB;

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -25,4 +25,6 @@ drop sequence employees_seq;
 drop table comments;
 drop sequence comments_seq;
 drop table hacks;
-drop table kitchen_sinks;
+drop table kitchen_sinks;
+drop table restaurants;
+drop table restaurants_suburbs;

data/test/fixtures/db_definitions/oracle.sql

@@ -143,4 +143,18 @@ create table kitchen_sinks (
 	a_date date,
 	a_string varchar(100),
 	constraint kitchen_sinks_pk primary key(id_1, id_2)
+);
+
+create table restaurants (
+	franchise_id number(11) not null,
+	store_id number(11) not null,
+	name varchar(100),
+	constraint restaurants_pk primary key (franchise_id, store_id)
+);
+
+create table restaurants_suburbs (
+	franchise_id number(11) not null,
+	store_id number(11) not null,
+	city_id number(11) not null,
+	suburb_id number(11) not null
 );

data/test/fixtures/db_definitions/sqlite.sql

@@ -110,4 +110,18 @@ create table kitchen_sinks (
 	a_date date,
 	a_string varchar(100),
 	primary key (id_1, id_2)
+);
+
+create table restaurants (
+	franchise_id integer not null,
+	store_id integer not null,
+	name varchar(100),
+	primary key (franchise_id, store_id)
+);
+
+create table restaurants_suburbs (
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
 );

data/test/test_associations.rb

@@ -4,9 +4,10 @@ require 'fixtures/tariff'
 require 'fixtures/product_tariff'
 require 'fixtures/suburb'
 require 'fixtures/street'
+require 'fixtures/restaurant'
 
 class TestAssociations < Test::Unit::TestCase
-  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets
+  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs
   
   def test_quoted_table_columns
     assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 
@@ -107,4 +108,12 @@ class TestAssociations < Test::Unit::TestCase
     @suburb = Suburb.find([2, 1], :include => :first_streets)
     assert_equal 1, @suburb.first_streets.size
   end
+  
+  def test_has_and_belongs_to_many
+    @restaurant = Restaurant.find([1,1])
+    assert_equal 2, @restaurant.suburbs.size
+    
+    @restaurant = Restaurant.find([1,1], :include => :suburbs)
+    assert_equal 2, @restaurant.suburbs.size  
+  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">0.9.91</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.9.92</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -81,7 +81,7 @@ to the database layer of Rails &#8211; <a href="http://wiki.rubyonrails.com/rail
   <span class="ident">set_primary_keys</span> <span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span>
   <span class="ident">belongs_to</span> <span class="symbol">:user</span>
   <span class="ident">belongs_to</span> <span class="symbol">:group</span>
-  <span class="ident">has_many</span> <span class="symbol">:statuses</span><span class="punct">,</span> <span class="symbol">:class</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">MembershipStatus</span><span class="punct">',</span> <span class="symbol">:foreign_key</span> <span class="punct">=&gt;</span> <span class="punct">[</span><span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span><span class="punct">]</span>
+  <span class="ident">has_many</span> <span class="symbol">:statuses</span><span class="punct">,</span> <span class="symbol">:class_name</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">MembershipStatus</span><span class="punct">',</span> <span class="symbol">:foreign_key</span> <span class="punct">=&gt;</span> <span class="punct">[</span><span class="symbol">:user_id</span><span class="punct">,</span> <span class="symbol">:group_id</span><span class="punct">]</span>
 <span class="keyword">end</span></pre></p>
 
 
@@ -291,7 +291,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>, 19th December 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 25th February 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -33,7 +33,7 @@ A model with composite primary keys would look like...
   set_primary_keys :user_id, :group_id
   belongs_to :user
   belongs_to :group
-  has_many :statuses, :class => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
 end</pre>
 
 A model associated with a composite key model would be defined like...

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.9.91
+  version: 0.9.92
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-19 00:00:00 +10:00
+date: 2008-02-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency