composite_primary_keys 4.0.0 → 4.1.1

data/History.txt

@@ -1,9 +1,31 @@
+== 4.1.1 2011-08-31
+* Support for AR 3.1.1 
+* Make polymorphic belongs_to work in rails 3.1.1 (Tom Hughes)
+* Eliminate relative paths from the test suite (Rhett Sutphin)
+* Minor improvements to the CPK test runner w/o relative path changes (Rhett Sutphin)
+* Remove stray puts (Rhett Sutphin)
+* Allow AR logs to go to a file when running tests.  This commit allows you to
+  specify a file to use instead via the CPK_LOGFILE environment variable.
+  STDOUT is still the default. (Rhett Sutphin)
+* Use ADAPTER env variable to select database to test.  For example:
+
+    ADAPTER=sqlite3 ruby test/test_suite.rb
+    (Rhett Sutphin)
+
+* Eliminate constant redef warnings during test runs (Rhett Sutphin)
+* Add missing fixture declarations (Rhett Sutphin)
+* Standardize on integer PKs in polymorphic fixtures  (Rhett Sutphin)
+* Fix tiny file name typos (Buck)
+
 == 4.0.0 2011-08-31
-* Sync release with Rails 3.1
+* Support for AR 3.1
 
 == 4.0.0.beta9 2011-08-22
 * Fix eager-loading in AR 3.1.rc6.
 
+== 4.0.0.beta9 2011-082-22
+* Fix eager-loading in AR 3.1.rc6.
+
 == 4.0.0.beta8 2011-082-22
 * Sqlite 3 fixes (Jan Vlnas)
 * Fixes for to_key method (Jan Vlnas)

data/README.txt

@@ -24,7 +24,7 @@ See http://compositekeys.rubyforge.org for more.
 
 == Running Tests
 
-See test/README.tests.txt
+See test/README_tests.txt
 
 == Url
 

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -24,7 +24,12 @@ module ActiveRecord
           end
 
           if reflection.source_macro == :belongs_to
-            key         = reflection.association_primary_key
+            if reflection.options[:polymorphic]
+              key = reflection.association_primary_key(klass)
+            else
+              key = reflection.association_primary_key
+            end
+
             foreign_key = reflection.foreign_key
           else
             key         = reflection.foreign_key
@@ -64,4 +69,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/README_tests.txt

@@ -18,9 +18,8 @@ To run the tests for one of the adapters follow these steps (using mysql in the
     - activerecord (3.1.0.rc5 or later)
     - mysql (or the adapter of your choice)
 
-* Put your mysql connection settings to test/connections/databases.yml
-  look into databases.example.sql for reference,
-  keep only one connection spec at once in databases.yml
+* Put your database connection settings in test/connections/databases.yml.
+  Look at databases.example.yml for examples.
 
     mysql:
       adapter: mysql
@@ -47,3 +46,11 @@ If you want to run closer to the metal you can cd into the test/
 directory and run the tests like so:
 
 * ADAPTER=mysql ruby test_equal.rb
+
+== Logging
+
+By default, ActiveRecord's log messages are sent to standard out when
+running the tests. If you would prefer to send them to a file, specify
+it as the environment variable CPK_LOGFILE:
+
+* CPK_LOGFILE=cpk_test.log rake mysql:test

data/test/abstract_unit.rb

@@ -2,16 +2,15 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require "pp"
 require "test/unit"
-require "./hash_tricks"
+require File.expand_path('../hash_tricks', __FILE__)
 
 # 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")
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'composite_primary_keys'
 
 # Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
-config = CompositePrimaryKeys::ConnectionSpec.config
-spec = config[config.keys.first]
+spec = CompositePrimaryKeys::ConnectionSpec[ENV['ADAPTER'] || 'postgresql']
 
 # And now connect to the database
 adapter = spec['adapter']
@@ -98,4 +97,4 @@ ActiveRecord::Base.connection.class.class_eval do
   end
 end
 
-ActiveRecord::Base.logger = Logger.new(STDOUT)
+ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)

data/test/connections/databases.example.yml

@@ -1,6 +1,6 @@
 # To run tests:
-#  1. Copy this file to databases.yml
-#  2. Delete all the specs except one
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
 
 mysql:
   adapter: mysql

data/test/connections/databases.yml

@@ -1,3 +1,16 @@
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+mysql:
+  adapter: mysql
+  username: root
+  database: composite_primary_keys_unittest
+
+sqlite3:
+  adapter: sqlite3
+  database: db/composite_primary_keys_unittest.sqlite3
+
 postgresql:
   adapter: postgresql
   database: composite_primary_keys_unittest

data/test/fixtures/comments.yml

@@ -7,10 +7,10 @@ comment2:
   id: 2
   person_id: 1
   person_type: User
-  hack_id: andrew
+  hack_id: 7
   
 comment3:
   id: 3
-  person_id: andrew
+  person_id: 7
   person_type: Hack
   

data/test/fixtures/db_definitions/mysql.sql

@@ -105,15 +105,16 @@ create table employees (
 
 create table comments (
     id int(11) not null auto_increment,
-    person_id varchar(100) default null,
+    person_id int(11) default null,
     person_type varchar(100) default null,
-    hack_id varchar(100) default null,
+    hack_id int(11) default null,
     primary key (id)
 ) type=InnoDB;
 
 create table hacks (
+    id int(11) not null auto_increment,
     name varchar(50) not null,
-    primary key (name)
+    primary key (id)
 ) type=InnoDB;
 
 create table restaurants (

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

@@ -25,6 +25,7 @@ drop sequence employees_seq;
 drop table comments;
 drop sequence comments_seq;
 drop table hacks;
+drop sequence hacks_seq;
 drop table restaurants;
 drop table restaurants_suburbs;
 drop table dorms;

data/test/fixtures/db_definitions/oracle.sql

@@ -115,13 +115,16 @@ create sequence comments_seq start with 1000;
 
 create table comments (
     id          number(11)   not null primary key,
-    person_id   varchar(100) default null,
+    person_id   number(11)   default null,
     person_type varchar(100) default null,
-    hack_id     varchar(100) default null
+    hack_id     number(11)   default null
 );
 
+create sequence hacks_seq start with 1000;
+
 create table hacks (
-    name varchar(50) not null primary key
+    id   number(11)  not null primary key,
+    name varchar(50) not null
 );
 
 create table restaurants (

data/test/fixtures/db_definitions/postgresql.sql

@@ -125,15 +125,18 @@ create sequence public.comments_seq start 1000;
 
 create table comments (
     id          int          not null default nextval('public.comments_seq'),
-    person_id   varchar(100) default null,
+    person_id   int          default null,
     person_type varchar(100) default null,
-    hack_id     varchar(100) default null,
+    hack_id     int          default null,
     primary key (id)
 );
 
+create sequence public.hacks_seq start 1000;
+
 create table hacks (
+    id   int         default nextval('public.hacks_seq'),
     name varchar(50) not null,
-    primary key (name)
+    primary key (id)
 );
 
 create table restaurants (

data/test/fixtures/db_definitions/sqlite.sql

@@ -95,14 +95,15 @@ create table employees (
 );
 
 create table comments (
-	id integer not null primary key autoincrement,
-	person_id varchar(100) null,
-	person_type varchar(100) null,
-	hack_id varchar(100) null
+    id integer not null primary key autoincrement,
+    person_id int null,
+    person_type varchar(100) null,
+    hack_id int null
 );
 
 create table hacks (
-    name varchar(50) not null primary key
+    id integer not null primary key autoincrement,
+    name varchar(50) not null
 );
 
 create table restaurants (

data/test/fixtures/hack.rb

@@ -1,5 +1,4 @@
 class Hack < ActiveRecord::Base
-  set_primary_keys :name
   has_many :comments, :as => :person
   
   has_one :first_comment, :as => :person, :class_name => "Comment"

data/test/fixtures/hacks.yml

@@ -1,2 +1,3 @@
 andrew:
+  id: 7
   name: andrew

data/test/fixtures/reference_type.rb

@@ -7,6 +7,5 @@ class ReferenceType < ActiveRecord::Base
 
   before_destroy do |record|
     a = record
-    puts a
   end
 end

data/test/test_associations.rb

@@ -1,9 +1,9 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestAssociations < ActiveSupport::TestCase
   fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
-           :departments, :memberships
+           :departments, :employees, :memberships, :membership_statuses
   
   def test_count
     assert_equal(3, Product.count(:include => :product_tariffs))

data/test/test_attribute_methods.rb

@@ -1,7 +1,7 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestAttributeMethods < ActiveSupport::TestCase
-  fixtures :reference_types
+  fixtures :reference_types, :reference_codes
 
   def test_read_attribute_with_single_key
     rt = ReferenceType.find(1)

data/test/test_attributes.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestAttributes < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs

data/test/test_composite_arrays.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class CompositeArraysTest < ActiveSupport::TestCase
 

data/test/test_create.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCreate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :streets, :suburbs

data/test/test_delete.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestDelete < ActiveSupport::TestCase
   fixtures :departments, :employees, :products, :product_tariffs,

data/test/test_dup.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestClone < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_equal.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestEqual < ActiveSupport::TestCase
   fixtures :capitols

data/test/test_exists.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestExists < ActiveSupport::TestCase
   fixtures :articles, :departments

data/test/test_find.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 # Testing the find action on composite ActiveRecords with two primary keys
 class TestFind < ActiveSupport::TestCase

data/test/test_habtm.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestHabtm < ActiveSupport::TestCase
   fixtures :suburbs, :restaurants, :restaurants_suburbs, :products

data/test/test_ids.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestIds < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_miscellaneous.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestMiscellaneous < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products

data/test/test_pagination.rb

@@ -1,4 +1,4 @@
-#require './abstract_unit'
+#require File.expand_path('../abstract_unit', __FILE__)
 #require 'plugins/pagination'
 #
 #class TestPagination < ActiveSupport::TestCase

data/test/test_polymorphic.rb

@@ -1,16 +1,16 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPolymorphic < ActiveSupport::TestCase
   fixtures :users, :employees, :comments, :hacks
   
   def test_polymorphic_has_many
-    comments = Hack.find('andrew').comments
-    assert_equal 'andrew', comments[0].person_id
+    comments = Hack.find(7).comments
+    assert_equal 7, comments[0].person_id
   end
 
   def test_polymorphic_has_one
-    first_comment = Hack.find('andrew').first_comment
-    assert_equal 'andrew', first_comment.person_id
+    first_comment = Hack.find(7).first_comment
+    assert_equal 7, first_comment.person_id
   end
 
   def test_has_many_through

data/test/test_predicates.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestEqual < ActiveSupport::TestCase
   fixtures :departments

data/test/test_santiago.rb

@@ -1,6 +1,6 @@
 # Test cases devised by Santiago that broke the Composite Primary Keys
 # code at one point in time. But no more!!!
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestSantiago < ActiveSupport::TestCase
   fixtures :suburbs, :streets, :users, :articles, :readings

data/test/test_suite.rb

@@ -1,22 +1,26 @@
 require 'test/unit'
 
-require './test_associations'
-require './test_attribute_methods'
-require './test_attributes'
-require './test_composite_arrays'
-require './test_create'
-require './test_delete'
-require './test_dup'
-require './test_equal'
-require './test_exists'
-require './test_find'
-require './test_habtm'
-require './test_ids'
-require './test_miscellaneous'
-require './test_pagination'
-require './test_polymorphic'
-require './test_predicates'
-require './test_santiago'
-require './test_tutorial_example'
-require './test_update'
-require './test_validations'
+%w(
+  test_associations
+  test_attribute_methods
+  test_attributes
+  test_composite_arrays
+  test_create
+  test_delete
+  test_dup
+  test_equal
+  test_exists
+  test_find
+  test_habtm
+  test_ids
+  test_miscellaneous
+  test_pagination
+  test_polymorphic
+  test_predicates
+  test_santiago
+  test_tutorial_example
+  test_update
+  test_validations
+).each do |test|
+  require File.expand_path("../#{test}", __FILE__)
+end

data/test/test_tutorial_example.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestTutorialExample < ActiveSupport::TestCase
   fixtures :users, :groups, :memberships, :membership_statuses

data/test/test_update.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestUpdate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_validations.rb

@@ -1,4 +1,4 @@
-require './abstract_unit'
+require File.expand_path('../abstract_unit', __FILE__)
 
 class TestValidations < ActiveSupport::TestCase
   fixtures :seats

metadata

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