composite_primary_keys 3.0.8 → 3.0.9

data/History.txt

@@ -1,3 +1,7 @@
+== 3.0.9 2010-12-04
+* Fix up support for composite key fixtures.
+
+
 == 3.0.8 2010-12-04
 * Fix for translation issue in unique validation.  Thanks to Daniel Berger for the patch.
 * Fix to support child classes of composite primary key models

data/lib/composite_primary_keys.rb

@@ -46,8 +46,8 @@ require 'active_record/associations/has_one_through_association'
 require 'active_record/associations/through_association_scope'
 require 'active_record/relation/query_methods'
 require 'active_record/attribute_methods/primary_key'
+require 'active_record/fixtures'
 
-require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/associations'
 require 'composite_primary_keys/associations/association_proxy'
@@ -65,6 +65,7 @@ require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/validations/uniqueness'
 require 'composite_primary_keys/query_methods'
 require 'composite_primary_keys/primary_key'
+require 'composite_primary_keys/fixtures'
 
 Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
   begin

data/lib/composite_primary_keys/fixtures.rb

@@ -1,8 +1,9 @@
-class Fixture #:nodoc:
+class Fixture
   def [](key)
     if key.is_a? Array
-      return key.map { |a_key| self[a_key.to_s] }.to_composite_ids
+      key.map { |a_key| self[a_key.to_s] }.to_composite_ids
+    else
+      @fixture[key]
     end
-    @fixture[key]
   end
 end

data/lib/composite_primary_keys/version.rb

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

data/test/debug.log

@@ -572,4 +572,18 @@ PGError: ERROR:  operator does not exist: character varying = integer
 LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
                                                                   ^
 HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 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 "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 : SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - Dr Nic Williams