composite_primary_keys 4.1.1 → 4.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 4.1.2 2012-01-12
+* Helper to allow the same tests to be used for both Oracle and other DBs
+by replacing quoted identifiers with all-caps equivalents on Oracle (Rhett Sutphin)
+* Update Oracle tests (Rhett Sutphin)
+
 == 4.1.1 2011-08-31
 * Support for AR 3.1.1 
 * Make polymorphic belongs_to work in rails 3.1.1 (Tom Hughes)

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -36,13 +36,19 @@ module ActiveRecord
             foreign_key = reflection.active_record_primary_key
           end
 
+          conditions = self.conditions[i]
+
           if reflection == chain.last
             # CPK
             # scope = scope.where(table[key].eq(owner[foreign_key]))
             predicate = cpk_join_predicate(table, key, owner, foreign_key)
             scope = scope.where(predicate)
 
-            conditions[i].each do |condition|
+            if reflection.type
+              scope = scope.where(table[reflection.type].eq(owner.class.base_class.name))
+            end
+
+            conditions.each do |condition|
               if options[:through] && condition.is_a?(Hash)
                 condition = { table.name => condition }
               end
@@ -53,14 +59,16 @@ module ActiveRecord
             # CPK
             # constraint = table[key].eq(foreign_table[foreign_key])
             constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-            scope = scope.where(predicate)
 
-            join       = join(foreign_table, constraint)
+            if reflection.type
+              type = chain[i + 1].klass.base_class.name
+              constraint = constraint.and(table[reflection.type].eq(type))
+            end
 
-            scope = scope.joins(join)
+            scope = scope.joins(join(foreign_table, constraint))
 
-            unless conditions[i].empty?
-              scope = scope.where(sanitize(conditions[i], table))
+            unless conditions.empty?
+              scope = scope.where(sanitize(conditions, table))
             end
           end
         end

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -81,6 +81,17 @@ class ActiveSupport::TestCase
   def composite?
     @key_test != :single
   end  
+
+  # Oracle metadata is in all caps.
+  def with_quoted_identifiers(s)
+    s.gsub(/"(\w+)"/) { |m|
+      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
+        m.upcase
+      else
+        m
+      end
+    }
+  end
 end
 
 def current_adapter?(type)

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

@@ -37,4 +37,6 @@ drop table room_attribute_assignments;
 drop table room_assignments;
 drop table students;
 drop sequence students_seq;
+drop table seats;
+drop table capitols;
 drop table products_restaurants;

data/test/fixtures/db_definitions/oracle.sql

@@ -181,6 +181,19 @@ create table room_assignments (
     room_id    number(11) not null
 );
 
+create table seats (
+    flight_number int not null,
+    seat          int not null,
+    customer      int,
+    primary key (flight_number, seat)
+);
+
+create table capitols (
+    country varchar2(2000) not null,
+    city varchar2(2000) not null,
+    primary key (country, city)
+);
+
 create table products_restaurants (
     product_id   number(11) not null,
     franchise_id number(11) not null,

data/test/test_associations.rb

@@ -19,6 +19,12 @@ class TestAssociations < ActiveSupport::TestCase
     product = products(:first_product)
     assert_equal(2, product.product_tariffs.count(:distinct => true))
   end
+  
+  def test_count_includes
+    count = Dorm.count(:include => :rooms,
+                       :conditions => ["rooms.room_id = ?", 2])
+    assert_equal(1, count)
+  end
 
   def test_products
     assert_not_nil products(:first_product).product_tariffs

data/test/test_find.rb

@@ -50,7 +50,7 @@ class TestFind < ActiveSupport::TestCase
     error = assert_raise(::ActiveRecord::RecordNotFound) do
       ReferenceCode.find(['999', '999'])
     end
-    assert_equal("Couldn't find ReferenceCode with ID=999,999 WHERE \"reference_codes\".\"reference_type_id\" = 999 AND \"reference_codes\".\"reference_code\" = 999",
+    assert_equal(with_quoted_identifiers("Couldn't find ReferenceCode with ID=999,999 WHERE \"reference_codes\".\"reference_type_id\" = 999 AND \"reference_codes\".\"reference_code\" = 999"),
                  error.message)
   end
 

data/test/test_predicates.rb

@@ -15,7 +15,7 @@ class TestEqual < ActiveSupport::TestCase
     end
 
     pred = cpk_or_predicate(predicates)
-    assert_equal('(("departments"."id" = 0) OR ("departments"."id" = 1) OR ("departments"."id" = 2))',
+    assert_equal(with_quoted_identifiers('(("departments"."id" = 0) OR ("departments"."id" = 1) OR ("departments"."id" = 2))'),
                  pred)
   end
 
@@ -29,7 +29,7 @@ class TestEqual < ActiveSupport::TestCase
     end
 
     pred = cpk_and_predicate(predicates)
-    assert_equal('"departments"."id" = 0 AND "departments"."id" = 1 AND "departments"."id" = 2',
+    assert_equal(with_quoted_identifiers('"departments"."id" = 0 AND "departments"."id" = 1 AND "departments"."id" = 2'),
                 pred.to_sql)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 Z
+date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &25587648 !ruby/object:Gem::Requirement
+  requirement: &22966128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *25587648
+  version_requirements: *22966128
 description: Composite key support for ActiveRecord 3
 email:
 - drnicwilliams@gmail.com