composite_primary_keys 3.0.0.b2 → 3.0.0.b3

data/lib/composite_primary_keys/associations.rb

@@ -95,19 +95,20 @@ module ActiveRecord
                 [id_rel, type_rel]
               else
                 foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
+
                 # CPK
-                # [aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key])]
+                #[aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key])]
                 composite_join_predicates(aliased_table, foreign_key,
                                           parent_table, reflection.options[:primary_key] || parent.primary_key)
               end
             when :belongs_to
-              [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.cpk_primary_key])]
+              [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name])]
             end
 
             unless klass.descends_from_active_record?
               sti_column = aliased_table[klass.inheritance_column]
               sti_condition = sti_column.eq(klass.sti_name)
-              klass.send(:subclasses).each {|subclass| sti_condition = sti_condition.or(sti_column.eq(subclass.sti_name)) }
+              klass.descendants.each {|subclass| sti_condition = sti_condition.or(sti_column.eq(subclass.sti_name)) }
 
               @join << sti_condition
             end

data/lib/composite_primary_keys/finder_methods.rb

@@ -2,6 +2,35 @@ module CompositePrimaryKeys
   module ActiveRecord
     module FinderMethods
       module InstanceMethods
+        def construct_limited_ids_condition(relation)
+          orders = relation.order_values.join(", ")
+
+          # CPK
+          # values = @klass.connection.distinct("#{@klass.connection.quote_table_name @klass.table_name}.#{@klass.primary_key}", orders)
+
+          keys = @klass.primary_keys.map do |key|
+            "#{@klass.connection.quote_table_name @klass.table_name}.#{key}"
+          end
+          values = @klass.connection.distinct(keys.join(', '), orders)
+
+          ids_array = relation.select(values).collect {|row| row[@klass.primary_key]}
+
+          # CPK
+          # ids_array.empty? ? raise(ThrowResult) : primary_key.in(ids_array)
+
+          # OR together each and expression (key=value and key=value) that matches an id set
+          # since we only need to match 0 or more records
+          or_expressions = ids_array.map do |id_set|
+            # AND together "key=value" exprssios to match each id set
+            and_expressions = [self.primary_keys, id_set].transpose.map do |key, id|
+              table[key].eq(id)
+            end
+            Arel::Predicates::All.new(*and_expressions)
+          end
+
+          Arel::Predicates::Any.new(*or_expressions).to_sql
+        end
+        
         def exists?(id = nil)
           case id
           when Array

data/lib/composite_primary_keys/query_methods.rb

@@ -0,0 +1,24 @@
+module ActiveRecord
+  module QueryMethods
+    def reverse_order
+      order_clause = arel.order_clauses.join(', ')
+      relation = except(:order)
+
+      # CPK
+      # order = order_clause.blank? ?
+      #  "#{@klass.table_name}.#{@klass.primary_key} DESC" :
+      #  reverse_sql_order(order_clause)
+
+      order = unless order_clause.blank?
+        reverse_sql_order(order_clause)
+      else
+        primary_keys = composite? ? @klass.primary_keys : [@klass.primary_key]
+        primary_keys.map do |key|
+          "#{@klass.table_name}.#{key} DESC"
+        end.join(", ")
+      end
+
+      relation.order Arel::SqlLiteral.new order
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

@@ -3,7 +3,7 @@ module CompositePrimaryKeys
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    PATCH = 'b2'
+    PATCH = 'b3'
     STRING = [MAJOR, MINOR, TINY, PATCH].join('.')
   end
 end

data/lib/composite_primary_keys.rb

@@ -44,6 +44,7 @@ require 'active_record/associations/has_many_association'
 require 'active_record/associations/has_one_association'
 require 'active_record/associations/has_one_through_association'
 require 'active_record/associations/through_association_scope'
+require 'active_record/relation/query_methods'
 
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/composite_arrays'
@@ -61,6 +62,7 @@ require 'composite_primary_keys/finder_methods'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/validations/uniqueness'
+require 'composite_primary_keys/query_methods'
 
 Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
   begin

data/test/abstract_unit.rb

@@ -11,7 +11,10 @@ require 'active_record'
 require 'active_record/fixtures'
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
-require 'composite_primary_keys'
+
+# To make debugging easier, test within this source tree versus an installed gem
+#require 'composite_primary_keys'
+require File.join(PROJECT_ROOT, "lib", "composite_primary_keys")
 
 # Tell ActiveRecord where to find models
 ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')

data/test/debug.log

@@ -0,0 +1,276 @@
+# Logfile created on Sat Nov 06 22:39:48 -0600 2010 by logger.rb/22285
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column suburbs.city_idsuburb_id does not exist
+LINE 1: ...T     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.ci...
+                                                             ^
+: SELECT     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.city_idsuburb_id DESC LIMIT 1
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column suburbs.city_idsuburb_id does not exist
+LINE 1: ...T     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.ci...
+                                                             ^
+: SELECT     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.city_idsuburb_id DESC LIMIT 1
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column suburbs.city_idsuburb_id does not exist
+LINE 1: ...T     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.ci...
+                                                             ^
+: SELECT     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.city_idsuburb_id DESC LIMIT 1
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column suburbs.suburb_iddesc does not exist
+LINE 1: ... FROM       "suburbs"  ORDER BY  suburbs.city_id, suburbs.su...
+                                                             ^
+: SELECT     "suburbs".* FROM       "suburbs"  ORDER BY  suburbs.city_id, suburbs.suburb_idDESC LIMIT 1
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column memberships.user_idgroup_id does not exist
+LINE 1: SELECT     "memberships"."user_idgroup_id" AS t0_r0, "member...
+                   ^
+: SELECT     "memberships"."user_idgroup_id" AS t0_r0, "memberships"."user_id" AS t0_r1, "memberships"."group_id" AS t0_r2, "membership_statuses"."id" AS t1_r0, "membership_statuses"."user_id" AS t1_r1, "membership_statuses"."group_id" AS t1_r2, "membership_statuses"."status" AS t1_r3 FROM       "memberships"  LEFT OUTER JOIN "membership_statuses" ON "membership_statuses"."user_id" = "memberships"."user_id" AND "membership_statuses"."group_id" = "memberships"."group_id" WHERE     (membership_statuses.status = 'Active')
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column memberships.user_idgroup_id does not exist
+LINE 1: SELECT     DISTINCT "memberships".user_idgroup_id FROM      ...
+                            ^
+: SELECT     DISTINCT "memberships".user_idgroup_id FROM       "memberships"  LEFT OUTER JOIN "membership_statuses" ON "membership_statuses"."user_id" = "memberships"."user_id" AND "membership_statuses"."group_id" = "memberships"."group_id" WHERE     (membership_statuses.status = 'Active') LIMIT 1
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (2.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE

data/test/test_associations.rb

@@ -129,8 +129,8 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_and_belongs_to_many
-    #@restaurant = Restaurant.find([1,1])
-    #assert_equal 2, @restaurant.suburbs.size
+    @restaurant = Restaurant.find([1,1])
+    assert_equal 2, @restaurant.suburbs.size
 
     @restaurant = Restaurant.find([1,1], :include => :suburbs)
     assert_equal 2, @restaurant.suburbs.size
@@ -159,4 +159,23 @@ class TestAssociations < ActiveSupport::TestCase
 
     assert_equal [1, 1], @membership.id
   end
+
+  def test_has_many_with_primary_key_with_associations
+    # Trigger Active Records find_with_associations method
+    memberships = Membership.find(:all, :include => :statuses,
+                                        :conditions => ["membership_statuses.status = ?",
+                                                        'Active'])
+
+    assert_equal(1, memberships.length)
+    assert_equal([1,1], memberships[0].id)
+  end
+
+  def test_limitable_reflections
+    memberships = Membership.find(:all, :include => :statuses,
+                                        :conditions => ["membership_statuses.status = ?",
+                                                        'Active'],
+                                        :limit => 1)
+    assert_equal(1, memberships.length)
+    assert_equal([1,1], memberships[0].id)
+  end
 end

data/test/test_find.rb

@@ -9,20 +9,20 @@ class TestFind < ActiveSupport::TestCase
       :class => ReferenceType,
       :primary_keys => [:reference_type_id],
     },
-    :dual   => { 
+    :dual   => {
       :class => ReferenceCode,
       :primary_keys => [:reference_type_id, :reference_code],
     },
-    :dual_strs   => { 
+    :dual_strs   => {
       :class => ReferenceCode,
       :primary_keys => ['reference_type_id', 'reference_code'],
     },
   }
-  
+
   def setup
     self.class.classes = CLASSES
   end
-  
+
   def test_find_first
     testing_with do
       obj = @klass.find(:first)
@@ -30,7 +30,7 @@ class TestFind < ActiveSupport::TestCase
       assert_equal @klass, obj.class
     end
   end
-  
+
   def test_find
     testing_with do
       found = @klass.find(*first_id) # e.g. find(1,1) or find 1,1
@@ -40,7 +40,7 @@ class TestFind < ActiveSupport::TestCase
       assert_equal found, @klass.find(found.to_param)
     end
   end
-  
+
   def test_find_composite_ids
     testing_with do
       found = @klass.find(first_id) # e.g. find([1,1].to_composite_ids)
@@ -50,16 +50,27 @@ class TestFind < ActiveSupport::TestCase
       assert_equal found, @klass.find(found.to_param)
     end
   end
-  
+
   def things_to_look_at
     testing_with do
       assert_equal found, @klass.find(found.id.to_s) # fails for 2+ keys
     end
   end
-  
+
   def test_not_found
     assert_raise(::ActiveRecord::RecordNotFound) do
       ReferenceCode.send :find, '999,999'
     end
   end
+
+  def test_find_last_suburb
+    suburb = Suburb.find(:last)
+    assert_equal([2,1], suburb.id)
+  end
+
+  def test_find_last_suburb_with_order
+    # Rails actually changes city_id DESC to city_id ASC
+    suburb = Suburb.find(:last, :order => 'suburbs.city_id DESC')
+    assert_equal([1,1], suburb.id)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 6629740
+  hash: 6629741
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - b2
-  version: 3.0.0.b2
+  - b3
+  version: 3.0.0.b3
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -06:00
+date: 2010-11-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/finder_methods.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/query_methods.rb
 - lib/composite_primary_keys/read.rb
 - lib/composite_primary_keys/reflection.rb
 - lib/composite_primary_keys/relation.rb
@@ -111,6 +112,7 @@ files:
 - test/connections/native_oracle_enhanced/connection.rb
 - test/connections/native_postgresql/connection.rb
 - test/connections/native_sqlite/connection.rb
+- test/debug.log
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/article_group.rb
@@ -236,6 +238,7 @@ specification_version: 3
 summary: Composite key support for ActiveRecord
 test_files: 
 - test/abstract_unit.rb
+- test/debug.log
 - test/hash_tricks.rb
 - test/README_tests.txt
 - test/test_associations.rb