composite_primary_keys 0.6.0 → 0.6.1

data/lib/composite_primary_keys/base.rb

@@ -87,36 +87,6 @@ module CompositePrimaryKeys
           end
         end
   
-        # Allows +attr_name+ to be the list of primary_keys, and returns the id
-        # of the object
-        # e.g. @object[@object.class.primary_key] => [1,1]
-        def [](attr_name)
-          if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
-            attr_name = attr_name.split(ID_SEP)
-          end
-          attr_name.is_a?(Array) ?
-            attr_name.map {|name| read_attribute(name)} :
-            read_attribute(attr_name)
-        end
-  
-        # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
-        # (Alias for the protected write_attribute method).
-        def []=(attr_name, value)
-          if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
-            attr_name = attr_name.split(ID_SEP)
-          end
-          if attr_name.is_a? Array
-            value = value.split(ID_SEP) if value.is_a? String
-            unless value.length == attr_name.length
-              raise "Number of attr_names and values do not match"
-            end
-            #breakpoint
-            [attr_name, value].transpose.map {|name,val| write_attribute(name.to_s, val)}
-          else
-            write_attribute(attr_name, value)
-          end
-        end
-
         # Define an attribute reader method.  Cope with nil column.
         def define_read_method(symbol, attr_name, column)
           cast_code = column.type_cast_code('v') if column
@@ -323,3 +293,41 @@ module CompositePrimaryKeys
     end
   end
 end
+
+module ActiveRecord
+  ID_SEP = ','
+  ID_SET_SEP = ';'
+
+  class Base
+    # Allows +attr_name+ to be the list of primary_keys, and returns the id
+    # of the object
+    # e.g. @object[@object.class.primary_key] => [1,1]
+    def [](attr_name)
+      if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
+        attr_name = attr_name.split(ID_SEP)
+      end
+      attr_name.is_a?(Array) ?
+        attr_name.map {|name| read_attribute(name)} :
+        read_attribute(attr_name)
+    end
+
+    # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
+    # (Alias for the protected write_attribute method).
+    def []=(attr_name, value)
+      if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
+        attr_name = attr_name.split(ID_SEP)
+      end
+      if attr_name.is_a? Array
+        value = value.split(ID_SEP) if value.is_a? String
+        unless value.length == attr_name.length
+          raise "Number of attr_names and values do not match"
+        end
+        #breakpoint
+        [attr_name, value].transpose.map {|name,val| write_attribute(name.to_s, val)}
+      else
+        write_attribute(attr_name, value)
+      end
+    end
+
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/associations_test.rb

@@ -2,9 +2,11 @@ require 'abstract_unit'
 require 'fixtures/product'
 require 'fixtures/tariff'
 require 'fixtures/product_tariff'
+require 'fixtures/suburb'
+require 'fixtures/street'
 
 class AssociationTest < Test::Unit::TestCase
-  fixtures :products, :tariffs, :product_tariffs
+  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets
 
   def setup
     super
@@ -79,8 +81,11 @@ class AssociationTest < Test::Unit::TestCase
     
   end
   
-  #I'm also having problems when I use composite primary keys together with eager loading of associations. Here I'm doing
-#ArtistName.find(:all, :include => :artist, ...)
-# => ActiveRecord::StatementInvalid: Mysql::Error: Unknown column 'artists_names.artist_id,name' in 'field list': SELECT artists_names.`artist_id,name` AS t0_r0, ....
-# Had a brief look into it but couldn't spot the code causing this...
+  def test_santiago
+    assert_not_nil @suburb = Suburb.find(1,1)
+    assert_equal 1, @suburb.streets.length
+    
+    assert_not_nil @street = Street.find(1)
+    assert_not_nil @street.suburb
+  end
 end

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

@@ -1,2 +1,7 @@
 DROP TABLE reference_codes;
 DROP TABLE reference_types;
+DROP TABLE products;
+DROP TABLE tariffs;
+DROP TABLE product_tariffs;
+DROP TABLE streets;
+DROP TABLE suburbs;

data/test/fixtures/db_definitions/mysql.sql

@@ -35,3 +35,18 @@ CREATE TABLE `product_tariffs` (
   PRIMARY KEY  (`product_id`,`tariff_id`,`tariff_start_date`)
 ) TYPE=InnoDB;
 
+CREATE TABLE `suburbs` (
+  `city_id` int(11) NOT NULL,
+  `suburb_id` int(11) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY  (`city_id`,`suburb_id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `streets` (
+  `id` int(11) NOT NULL auto_increment,
+  `city_id` int(11) NOT NULL,
+  `suburb_id` int(11) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+

data/test/fixtures/street.rb

@@ -0,0 +1,3 @@
+class Street < ActiveRecord::Base
+  belongs_to :suburb,  :foreign_key => [:city_id, :suburb_id]
+end

data/test/fixtures/streets.yml

@@ -0,0 +1,5 @@
+first:
+  id: 1
+  city_id: 1
+  suburb_id: 1
+  name: First Street

data/test/fixtures/suburb.rb

@@ -0,0 +1,4 @@
+class Suburb < ActiveRecord::Base
+  set_primary_keys :city_id, :suburb_id
+  has_many :streets,  :foreign_key => [:city_id, :suburb_id]
+end

data/test/fixtures/suburbs.yml

@@ -0,0 +1,4 @@
+first:
+  city_id: 1
+  suburb_id: 1
+  name: First Suburb

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2006-08-02 00:00:00 +02:00
+  version: 0.6.1
+date: 2006-08-03 00:00:00 +02:00
 summary: Support for composite primary keys in ActiveRecords
 require_paths: 
 - lib
@@ -69,6 +69,10 @@ files:
 - test/fixtures/products.yml
 - test/fixtures/tariffs.yml
 - test/fixtures/product_tariffs.yml
+- test/fixtures/street.rb
+- test/fixtures/suburb.rb
+- test/fixtures/streets.yml
+- test/fixtures/suburbs.yml
 - test/fixtures/db_definitions/mysql.drop.sql
 - test/fixtures/db_definitions/mysql.sql
 test_files: []