composite_primary_keys 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.3 2008-07-13
+
+* more fixes and tests for has many through [thx Menno van der Sman]
+
 == 1.0.2 2008-06-07
 
 * fix for has many through when through association has composite keys

data/lib/composite_primary_keys/associations.rb

@@ -228,43 +228,48 @@ module ActiveRecord::Associations
     
     def composite_where_clause(full_keys, ids)
       full_keys = full_keys.split(CompositePrimaryKeys::ID_SEP) if full_keys.is_a?(String)
+      
       if ids.is_a?(String)
         ids = [[ids]]
       elsif not ids.first.is_a?(Array) # if single comp key passed, turn into an array of 1
         ids = [ids.to_composite_ids]
       end
+      
       where_clause = ids.map do |id_set|
         transposed = id_set.size == 1 ? [[full_keys, id_set.first]] : [full_keys, id_set].transpose
         transposed.map do |full_key, id|
           "#{full_key.to_s}=#{@reflection.klass.sanitize(id)}"
         end.join(" AND ")
       end.join(") OR (")
+      
       "(#{where_clause})"
     end
 
     def composite_join_clause(full_keys1, 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|
         "#{key_pair.first}=#{key_pair.last}"
       end.join(" AND ")
+      
       "(#{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) ?
-        keys.collect {|key| "#{table_name}.#{key}"}.join(CompositePrimaryKeys::ID_SEP) : 
-        "#{table_name}.#{keys}"
+      keys.is_a?(Array) ? keys.collect {|key| "#{table_name}.#{key}"}.join(CompositePrimaryKeys::ID_SEP) : "#{table_name}.#{keys}"
     end
     
     def full_columns_equals(table_name, keys, quoted_ids)
@@ -285,10 +290,7 @@ module ActiveRecord::Associations
       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 = full_columns_equals(@reflection.options[:join_table], @reflection.primary_key_name, @owner.quoted_id)
         @finder_sql << " AND (#{conditions})" if conditions
       end
 
@@ -310,8 +312,7 @@ module ActiveRecord::Associations
           @finder_sql << " AND (#{conditions})" if conditions
             
         else
-          @finder_sql = full_columns_equals(@reflection.klass.table_name, 
-                                  @reflection.primary_key_name, @owner.quoted_id)
+          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
           @finder_sql << " AND (#{conditions})" if conditions
       end
 
@@ -331,18 +332,18 @@ module ActiveRecord::Associations
 		records.each { |r| r.destroy }
 	  else
 		field_names = @reflection.primary_key_name.split(',')
-		field_names.collect! {|n|
-			n + " = NULL"
-		}
-		records.each { |r|
-			where_class = nil
-			if r.quoted_id.include?(',')
-				where_class = [@reflection.klass.primary_key, r.quoted_id].transpose.map {|pair| "(#{pair[0]} = #{pair[1]})"}.join(" AND ")
-			else
-				where_class = @reflection.klass.primary_key + ' = ' +  r.quoted_id
-			end
-			@reflection.klass.update_all(  field_names.join(',') , where_class)
-		}
+		field_names.collect! {|n| n + " = NULL"}
+		records.each do |r|
+		  where_class = nil
+		  
+		  if r.quoted_id.include?(',')
+		    where_class = [@reflection.klass.primary_key, r.quoted_id].transpose.map {|pair| "(#{pair[0]} = #{pair[1]})"}.join(" AND ")
+		  else
+		    where_class = @reflection.klass.primary_key + ' = ' +  r.quoted_id
+		  end
+		  
+		  @reflection.klass.update_all(  field_names.join(',') , where_class)
+		end
 	  end
 	end
   end
@@ -355,79 +356,37 @@ module ActiveRecord::Associations
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"          
         else
-          @finder_sql = full_columns_equals(@reflection.klass.table_name, 
-                                  @reflection.primary_key_name, @owner.quoted_id)
+          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
       end
+      
       @finder_sql << " AND (#{conditions})" if conditions
     end
   end
+
   
   class HasManyThroughAssociation < HasManyAssociation #:nodoc:
     def construct_conditions
-      conditions = if @reflection.through_reflection.options[:as]
-          "#{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_id = #{@owner.quoted_id} " + 
-          "AND #{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
-      else
-        @finder_sql = full_columns_equals(@reflection.through_reflection.table_name, 
-                                  @reflection.through_reflection.primary_key_name, @owner.quoted_id)
-      end
+      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
-      
-      return conditions
+      conditions
     end
     
-    def construct_joins(custom_joins = nil)          
-      polymorphic_join = nil
-      if @reflection.through_reflection.options[:as] || @reflection.source_reflection.macro == :belongs_to
+    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
       else
         reflection_primary_key = @reflection.source_reflection.primary_key_name
         source_primary_key     = @reflection.klass.primary_key
-        if @reflection.source_reflection.options[:as]
-          polymorphic_join = "AND %s.%s = %s" % [
-            @reflection.table_name, "#{@reflection.source_reflection.options[:as]}_type",
-                @owner.class.quote_value(@reflection.through_reflection.klass.name)
-              ]
-            end
-          end
-
-          "INNER JOIN %s ON %s %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)),
-            polymorphic_join
-          ]
-    end
-    
-    def construct_sql
-      case
-        when @reflection.options[:finder_sql]
-          @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
-
-          @finder_sql << " AND (#{conditions})" if conditions
-        when @reflection.options[:as]
-          @finder_sql = 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
-          @finder_sql << " AND (#{conditions})" if conditions
-        
-        else
-          @finder_sql = composite_where_clause(
-            full_keys(@reflection.klass.table_name, @reflection.primary_key_name), @owner.quoted_id),
-          @finder_sql << " AND (#{conditions})" if conditions
       end
 
-      if @reflection.options[:counter_sql]
-        @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-      elsif @reflection.options[:finder_sql]
-        # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
-        @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
-        @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-      else
-        @counter_sql = @finder_sql
-      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))
+      ]
     end
   end
 end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/mysql.sql

@@ -157,5 +157,16 @@ create table room_attributes (
 create table room_attribute_assignments (
 	dorm_id int(11) not null,
 	room_id int(11) not null,
-	room_attribute_id integer not null
+	room_attribute_id int(11) not null
+) TYPE=InnoDB;
+
+create table students (
+	id int(11) not null auto_increment,
+	primary key(id)
+) TYPE=InnoDB;
+
+create table room_assignments (
+	student_id int(11) not null,
+	dorm_id int(11) not null,
+	room_id int(11) not null	
 ) TYPE=InnoDB;

data/test/fixtures/db_definitions/sqlite.sql

@@ -146,3 +146,13 @@ create table room_attribute_assignments (
 	room_id integer not null,
 	room_attribute_id integer not null
 );
+
+create table students (
+	id integer not null primary key autoincrement
+);
+
+create table room_assignments (
+	student_id integer not null,
+	dorm_id integer not null,
+	room_id integer not null	
+);

data/test/fixtures/user.rb

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

data/test/test_associations.rb

@@ -9,16 +9,38 @@ require 'fixtures/dorm'
 require 'fixtures/room'
 require 'fixtures/room_attribute'
 require 'fixtures/room_attribute_assignment'
+require 'fixtures/student'
+require 'fixtures/room_assignment'
 
 class TestAssociations < Test::Unit::TestCase
   fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments
   
   def test_quoted_table_columns
     assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 
         ProductTariff.send(:quoted_table_columns, ProductTariff.primary_key)
   end
   
+  def test_has_many_through_with_conditions_when_through_association_is_not_composite
+    user = User.find(:first)
+    assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size
+  end
+
+  def test_has_many_through_with_conditions_when_through_association_is_composite
+    room = Room.find(:first)
+    assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"]).size
+  end
+
+  def test_has_many_through_on_custom_finder_when_through_association_is_not_composite
+    user = User.find(:first)
+    assert_equal 1, user.find_custom_articles.size
+  end
+
+  def test_has_many_through_on_custom_finder_when_through_association_is_composite
+    room = Room.find(:first)
+    assert_equal 0, room.find_custom_room_attributes.size
+  end
+  
   def test_count
     assert_equal 2, Product.count(:include => :product_tariffs)
     assert_equal 3, Tariff.count(:include => :product_tariffs)
@@ -100,6 +122,14 @@ class TestAssociations < Test::Unit::TestCase
       "Incorrect number of tariffs returned"
   end
   
+  def test_has_many_through_when_not_pre_loaded
+  	student = Student.find(:first)
+  	rooms = student.rooms
+  	assert_equal 1, rooms.size
+  	assert_equal 1, rooms.first.dorm_id
+  	assert_equal 1, rooms.first.room_id
+  end
+  
   def test_has_many_through_when_through_association_is_composite
     dorm = Dorm.find(:first)
     assert_equal 1, dorm.rooms.length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-07 00:00:00 -05:00
+date: 2008-07-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Composite key support for ActiveRecords