composite_primary_keys 0.6.1 → 0.6.2

data/lib/composite_primary_keys/associations.rb

@@ -206,16 +206,19 @@ module ActiveRecord::Associations
     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) :
+        keys.collect {|key| "#{table_name}.#{key}"}.join(CompositePrimaryKeys::ID_SEP) : 
         "#{table_name}.#{keys}"
     end
     
     def full_columns_equals(table_name, keys, quoted_ids)
+      if keys.is_a?(Symbol) or (keys.is_a?(String) and keys == keys.split(CompositePrimaryKeys::ID_SEP))
+        return "#{table_name}.#{keys} = #{quoted_ids}"
+      end
       keys = keys.split(CompositePrimaryKeys::ID_SEP) if keys.is_a?(String)
-      keys_ids = [keys, quoted_ids]
-      keys_ids = keys.is_a?(Symbol) ? [keys_ids] : keys_ids.transpose
+      quoted_ids = quoted_ids.split(CompositePrimaryKeys::ID_SEP) if quoted_ids.is_a?(String)
+      keys_ids = [keys, quoted_ids].transpose
       keys_ids.collect {|key, id| "(#{table_name}.#{key} = #{id})"}.join(' AND ')
-    end
+    end  
   end
 
   class HasManyAssociation < AssociationCollection #:nodoc:

data/lib/composite_primary_keys/version.rb

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

data/test/associations_test.rb

@@ -81,11 +81,4 @@ class AssociationTest < Test::Unit::TestCase
     
   end
   
-  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/attributes_test.rb

@@ -11,7 +11,7 @@ class AttributesTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
     },
     :dual   => { 
       :class => ReferenceCode,
@@ -34,7 +34,7 @@ class AttributesTest < Test::Unit::TestCase
     
   def test_brackets_primary_key
     testing_with do
-      assert_equal @first.id, @first[@primary_keys]
+      assert_equal @first.id, @first[@primary_keys], "[] failing for #{@klass}"
       assert_equal @first.id, @first[@first.class.primary_key]
     end
   end

data/test/clone_test.rb

@@ -8,7 +8,7 @@ class CloneTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
     },
     :dual   => { 
       :class => ReferenceCode,

data/test/create_test.rb

@@ -8,7 +8,7 @@ class DummyTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
       :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
     },
     :dual   => { 

data/test/delete_test.rb

@@ -8,7 +8,7 @@ class DeleteTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
     },
     :dual   => { 
       :class => ReferenceCode,

data/test/dummy_test.rb

@@ -8,7 +8,7 @@ class DummyTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
     },
     :dual   => { 
       :class => ReferenceCode,

data/test/fixtures/article.rb

@@ -0,0 +1,5 @@
+class Article < ActiveRecord::Base
+  has_many :readings
+  has_many :users, :through => :readings
+end
+

data/test/fixtures/articles.yml

@@ -0,0 +1,6 @@
+first:
+  id: 1
+  name: Article One
+second:
+  id: 2
+  name: Article Two

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

@@ -5,3 +5,6 @@ DROP TABLE tariffs;
 DROP TABLE product_tariffs;
 DROP TABLE streets;
 DROP TABLE suburbs;
+DROP TABLE users;
+DROP TABLE articles;
+DROP TABLE readings;

data/test/fixtures/db_definitions/mysql.sql

@@ -50,3 +50,23 @@ CREATE TABLE `streets` (
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `articles` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) NOT NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `readings` (
+  `id` int(11) NOT NULL auto_increment,
+  `user_id` int(11) NOT NULL,
+  `article_id` int(11) NOT NULL,
+  `rating` int(11) NOT NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+

data/test/fixtures/reading.rb

@@ -0,0 +1,4 @@
+class Reading < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :user
+end 

data/test/fixtures/readings.yml

@@ -0,0 +1,10 @@
+santiago_first:
+  id: 1
+  user_id: 1
+  article_id: 1
+  rating: 4
+santiago_second:
+  id: 2
+  user_id: 1
+  article_id: 2
+  rating: 5

data/test/fixtures/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  has_many :readings
+  has_many :articles, :through => :readings
+end
+

data/test/fixtures/users.yml

@@ -0,0 +1,6 @@
+santiago:
+  id: 1
+  name: Santiago
+drnic:
+  id: 2
+  name: Dr Nic

data/test/miscellaneous_test.rb

@@ -8,7 +8,7 @@ class MiscellaneousTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
     },
     :dual   => { 
       :class => ReferenceCode,

data/test/pagination_test.rb

@@ -11,7 +11,7 @@ class PaginationTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
       :table => :reference_types,
     },
     :dual   => { 

data/test/santiago_test.rb

@@ -0,0 +1,27 @@
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+
+require 'abstract_unit'
+require 'fixtures/user'
+require 'fixtures/article'
+require 'fixtures/reading'
+
+class AssociationTest < Test::Unit::TestCase
+  fixtures :suburbs, :streets, :users, :articles, :readings
+  
+  def test_normal_and_composite_associations
+    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
+  
+  def test_single_keys
+    @santiago = users(:santiago)
+    assert_not_nil @santiago.articles
+    assert_equal 2, @santiago.articles.length
+    assert_not_nil @santiago.readings
+    assert_equal 2, @santiago.readings.length
+  end
+end

data/test/update_test.rb

@@ -8,7 +8,7 @@ class UpdateTest < Test::Unit::TestCase
   CLASSES = {
     :single => {
       :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
+      :primary_keys => :reference_type_id,
       :update => { :description => 'RT Desc' },
     },
     :dual   => { 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 date: 2006-08-03 00:00:00 +02:00
 summary: Support for composite primary keys in ActiveRecords
 require_paths: 
@@ -56,6 +56,7 @@ files:
 - test/associations_test.rb
 - test/attributes_test.rb
 - test/create_test.rb
+- test/santiago_test.rb
 - test/connections/native_mysql
 - test/connections/native_mysql/connection.rb
 - test/fixtures/reference_type.rb
@@ -73,6 +74,12 @@ files:
 - test/fixtures/suburb.rb
 - test/fixtures/streets.yml
 - test/fixtures/suburbs.yml
+- test/fixtures/article.rb
+- test/fixtures/user.rb
+- test/fixtures/reading.rb
+- test/fixtures/articles.yml
+- test/fixtures/users.yml
+- test/fixtures/readings.yml
 - test/fixtures/db_definitions/mysql.drop.sql
 - test/fixtures/db_definitions/mysql.sql
 test_files: []