composite_primary_keys 1.0.7 → 1.0.8

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.8 2008-08-27
+
+* fix has_many :through for non composite models [thx rcarver]
+
 == 1.0.7 2008-08-12
 
 * fix for the last fix -- when has_many is composite and belongs_to is single

data/lib/composite_primary_keys/associations.rb

@@ -372,31 +372,38 @@ module ActiveRecord::Associations
       @finder_sql << " AND (#{conditions})" if conditions
     end
   end
-
   
   class HasManyThroughAssociation < HasManyAssociation #:nodoc:
-    def construct_conditions
-      raise 'polymorphic joins are not supported by composite_primary_keys' if @reflection.through_reflection.options[:as]
-      conditions = full_columns_equals(@reflection.through_reflection.table_name, @reflection.through_reflection.primary_key_name, @owner.quoted_id)
-      conditions << " AND (#{sql_conditions})" if sql_conditions
-      conditions
+    def construct_conditions_with_composite_keys
+      if @reflection.through_reflection.options[:as]
+        construct_conditions_without_composite_keys;
+      else
+        conditions = full_columns_equals(@reflection.through_reflection.table_name, @reflection.through_reflection.primary_key_name, @owner.quoted_id)
+        conditions << " AND (#{sql_conditions})" if sql_conditions
+        conditions
+      end
     end
+    alias_method_chain :construct_conditions, :composite_keys
     
-    def construct_joins(custom_joins = nil)
-      raise 'polymorphic joins are not supported by composite_primary_keys' if @reflection.through_reflection.options[:as] || @reflection.source_reflection.options[:as]
-      
-      if @reflection.source_reflection.macro == :belongs_to
-        reflection_primary_key = @reflection.klass.primary_key
-        source_primary_key     = @reflection.source_reflection.primary_key_name
+    def construct_joins_with_composite_keys(custom_joins = nil)
+      if @reflection.through_reflection.options[:as] || @reflection.source_reflection.options[:as]
+        construct_joins_without_composite_keys(custom_joins)
       else
-        reflection_primary_key = @reflection.source_reflection.primary_key_name
-        source_primary_key     = @reflection.klass.primary_key
-      end
+        if @reflection.source_reflection.macro == :belongs_to
+          reflection_primary_key = @reflection.klass.primary_key
+          source_primary_key     = @reflection.source_reflection.primary_key_name
+        else
+          reflection_primary_key = @reflection.source_reflection.primary_key_name
+          source_primary_key     = @reflection.klass.primary_key
+        end
 
-      "INNER JOIN %s ON %s #{@reflection.options[:joins]} #{custom_joins}" % [
-        @reflection.through_reflection.table_name,
-        composite_join_clause(full_keys(@reflection.table_name, reflection_primary_key), full_keys(@reflection.through_reflection.table_name, source_primary_key))
-      ]
+        "INNER JOIN %s ON %s #{@reflection.options[:joins]} #{custom_joins}" % [
+          @reflection.through_reflection.table_name,
+          composite_join_clause(full_keys(@reflection.table_name, reflection_primary_key), full_keys(@reflection.through_reflection.table_name, source_primary_key))
+        ]
+      end
     end
+    alias_method_chain :construct_joins, :composite_keys    
   end
+  
 end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/comment.rb

@@ -1,5 +1,6 @@
 class Comment < ActiveRecord::Base
   set_primary_keys :id
   belongs_to :person, :polymorphic => true
+  belongs_to :hack
 end
 

data/test/fixtures/comments.yml

@@ -7,8 +7,10 @@ comment2:
   id: 2
   person_id: 1
   person_type: User
+  hack_id: andrew
   
 comment3:
   id: 3
   person_id: andrew
-  person_type: Hack
+  person_type: Hack
+  

data/test/fixtures/db_definitions/mysql.sql

@@ -107,6 +107,7 @@ CREATE TABLE comments (
 	id int(11) NOT NULL auto_increment,
 	person_id varchar(100) DEFAULT NULL,
 	person_type varchar(100) DEFAULT NULL,
+	hack_id varchar(100) DEFAULT NULL,
 	PRIMARY KEY (id)
 ) TYPE=InnoDB;
 

data/test/fixtures/db_definitions/oracle.sql

@@ -127,7 +127,8 @@ create sequence employees_seq
 CREATE TABLE comments (
 	id number(11) NOT NULL PRIMARY KEY,
 	person_id varchar(100) DEFAULT NULL,
-	person_type varchar(100) DEFAULT NULL
+	person_type varchar(100) DEFAULT NULL,
+	hack_id varchar(100) DEFAULT NULL
 );
 
 create sequence comments_seq

data/test/fixtures/db_definitions/postgresql.sql

@@ -115,6 +115,7 @@ CREATE TABLE comments (
 	id int NOT NULL,
 	person_id varchar(100) DEFAULT NULL,
 	person_type varchar(100) DEFAULT NULL,
+	hack_id varchar(100) DEFAULT NULL,
 	PRIMARY KEY (id)
 );
 

data/test/fixtures/db_definitions/sqlite.sql

@@ -97,7 +97,8 @@ CREATE TABLE employees (
 CREATE TABLE comments (
 	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	person_id varchar(100) NULL,
-	person_type varchar(100) NULL
+	person_type varchar(100) NULL,
+	hack_id varchar(100) NULL
 );
 
 CREATE TABLE hacks (

data/test/fixtures/user.rb

@@ -2,6 +2,7 @@ class User < ActiveRecord::Base
   has_many :readings
   has_many :articles, :through => :readings
   has_many :comments, :as => :person
+  has_many :hacks, :through => :comments, :source => :hack
   
   def find_custom_articles
     articles.find(:all, :conditions => ["name = ?", "Article One"])

data/test/test_polymorphic.rb

@@ -9,12 +9,23 @@ class TestPolymorphic < Test::Unit::TestCase
   
   def test_polymorphic_has_many
     comments = Hack.find('andrew').comments
-    assert comments[0].person_id = 'andrew'
+    assert_equal 'andrew', comments[0].person_id
   end
   
   def test_polymorphic_has_one
     first_comment = Hack.find('andrew').first_comment
-    assert first_comment.person_id = 'andrew'
+    assert_equal 'andrew', first_comment.person_id
+  end
+  
+  def test_has_many_through
+    user = users(:santiago)
+    article_names = user.articles.collect { |a| a.name }.sort
+    assert_equal ['Article One', 'Article Two'], article_names
+  end
+  
+  def test_polymorphic_has_many_through
+    user = users(:santiago)
+    assert_equal ['andrew'], user.hacks.collect { |a| a.name }.sort
   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.6</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.8</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 

data/website/version-raw.js

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

data/website/version.js

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

metadata

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