composite_primary_keys 5.0.5 → 5.0.6

data/History.rdoc

@@ -1,3 +1,12 @@
+== 5.0.6 2012-05-20
+* Fixed bug where setting a belongs_to association to nil would raise an error (Tyler Rick)
+* Remove special case code for 1 column selects and just choose to use Rails version of the
+  method unless we need ours to deal with an Array (Sammy Larbi)
+* Change count tests to actually check for distinct, fix resulting error it
+  demonstrated in the code (Sammy Larbi)
+* Specify mysql2 driver by default (Charlie Savage)
+* Update sqlite tests to run on Windows (Charlie Savage)
+
 == 5.0.5 2012-05-05
 * Count without slower subquery in cases where that is possible (Sammy Larbi)
 * When you call association.build for a has_many association that uses a
@@ -105,6 +114,9 @@ by replacing quoted identifiers with all-caps equivalents on Oracle (Rhett Sutph
 * ActiveRecord 3.1 RC1 compatibility.  This required a significant rewrite due to
   all the changes in AR 3.1 versus 3.0.
 
+== 3.1.11 2012-05-20
+Fix AssociationReflection#derive_primary_key for belongs_to relationships (Heinrich Lee Yu).
+
 == 3.1.10 2011-07-08
 * Bugfix for belongs_to with includes (John Ash)
 * Improved tests for calling clear on a habtm association, which involved (David Rueck)

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -4,6 +4,7 @@ module ActiveRecord
       def write_attribute(attr_name, value)
         # CPK
         if attr_name.kind_of?(Array)
+          value = [nil]*attr_name.length if value.nil?
           unless value.length == attr_name.length
             raise "Number of attr_names and values do not match"
           end

data/lib/composite_primary_keys/relation/calculations.rb

@@ -39,6 +39,7 @@ module CompositePrimaryKeys
       end
 
       def build_count_subquery(relation, column_name, distinct)
+        return super(relation, column_name, distinct) unless column_name.kind_of?(Array)
         # CPK
         # column_alias = Arel.sql('count_column')
         subquery_alias = Arel.sql('subquery_for_count')
@@ -46,24 +47,8 @@ module CompositePrimaryKeys
         # CPK
         # aliased_column = aggregate_column(column_name == :all ? 1 : column_name).as(column_alias)
         # relation.select_values = [aliased_column]
-        relation.select_values = if column_name.kind_of?(Array)
-            column_name.map do |column|
-              Arel::Attribute.new(@klass.unscoped.table, column)
-            end
-          elsif @klass.column_names.include?(column_name.to_s)
-            [Arel::Attribute.new(@klass.unscoped.table, column_name)]
-          else
-            [Arel.sql(column_name == :all ? "#{@klass.quoted_table_name}.*" : column_name.to_s)]
-          end
-        
-        # do not use slower subquery if we're only counting on one column
-        if relation.select_values.count == 1
-          # exclude distinct table_name.* in case of joins where subbing * would change results
-          if (!distinct && column_name == :all) || column_name != :all
-            column = relation.select_values[0].gsub("#{@klass.quoted_table_name}.","")
-            relation.select_values = [operation_over_aggregate_column(column, 'count', distinct)]
-            return relation.arel
-          end
+        relation.select_values = column_name.map do |column|
+          Arel::Attribute.new(@klass.unscoped.table, column)
         end
         
         relation.distinct(true)

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/mysql.rake

@@ -2,7 +2,7 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :mysql do
-  desc 'Create the MySQL test databases'
+  desc 'Create the MySQL test database'
   task :create_database do
     ActiveRecord::Base.clear_all_connections!
     spec = CompositePrimaryKeys::ConnectionSpec['mysql'].dup
@@ -12,8 +12,8 @@ namespace :mysql do
     ActiveRecord::Base.clear_all_connections!
   end
 
-  desc 'Build the MySQL test databases'
-  task :build_databases => [:create_database] do
+  desc 'Build the MySQL test database'
+  task :build_database => [:create_database] do
     path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
     sql = File.open(path, 'rb') do |file|
       file.read
@@ -25,13 +25,13 @@ namespace :mysql do
     ActiveRecord::Base.connection.execute(sql)
   end
 
-  desc 'Drop the MySQL test databases'
-  task :drop_databases => :load_connection do
+  desc 'Drop the MySQL test database'
+  task :drop_database => :load_connection do
     ActiveRecord::Base.connection.drop_database(SPEC['database'])
   end
 
-  desc 'Rebuild the MySQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
+  desc 'Rebuild the MySQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
   
   task :load_connection do
     require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")

data/tasks/databases/oracle.rake

@@ -2,22 +2,22 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :oracle do
-  desc 'Build the Oracle test databases'
-  task :build_databases => :load_connection do
+  desc 'Build the Oracle test database'
+  task :build_database => :load_connection do
     options_str = connection_string
 
     schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
     sh %( sqlplus #{options_str} < #{schema} )
   end
 
-  desc 'Drop the Oracle test databases'
-  task :drop_databases => :load_connection do 
+  desc 'Drop the Oracle test database'
+  task :drop_database => :load_connection do 
     options_str = connection_string
     sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
   end
 
-  desc 'Rebuild the Oracle test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
+  desc 'Rebuild the Oracle test database'
+  task :rebuild_database => [:drop_database, :build_database]
 
   task :load_connection do
     require File.join(PROJECT_ROOT, "test", "connections", "native_oracle", "connection")

data/tasks/databases/postgresql.rake

@@ -2,7 +2,7 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :postgresql do
-  desc 'Create the PostgreSQL test databases'
+  desc 'Create the PostgreSQL test database'
   task :create_database do
     ActiveRecord::Base.clear_all_connections!
     spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
@@ -13,8 +13,8 @@ namespace :postgresql do
     ActiveRecord::Base.clear_all_connections!
   end
 
-  desc 'Build the PostgreSQL test databases'
-  task :build_databases => [:create_database] do
+  desc 'Build the PostgreSQL test database'
+  task :build_database => [:create_database] do
     path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
     sql = File.open(path, 'rb') do |file|
       file.read
@@ -24,8 +24,8 @@ namespace :postgresql do
     ActiveRecord::Base.connection.execute(sql)
   end
 
-  desc 'Drop the PostgreSQL test databases'
-  task :drop_databases => :load_connection do
+  desc 'Drop the PostgreSQL test database'
+  task :drop_database => :load_connection do
     ActiveRecord::Base.clear_all_connections!
     spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
     database_name = spec.delete('database')
@@ -35,8 +35,8 @@ namespace :postgresql do
     ActiveRecord::Base.clear_all_connections!
   end
 
-  desc 'Rebuild the PostgreSQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
+  desc 'Rebuild the PostgreSQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
 
   task :load_connection do
     require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")

data/tasks/databases/sqlite3.rake

@@ -2,26 +2,24 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :sqlite3 do
-  desc 'Build the sqlite test databases'
-  task :build_databases => :load_connection do
+  desc 'Build the sqlite test database'
+  task :build_database => :load_connection do
     schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
     dbfile = File.join(PROJECT_ROOT, connection_string)
-    cmd = "mkdir -p #{File.dirname(dbfile)}"
-    puts cmd
-    sh %{ #{cmd} }
+    FileUtils.mkdir_p(File.dirname(dbfile))
     cmd = "sqlite3 #{dbfile} < #{schema}"
     puts cmd
     sh %{ #{cmd} }
   end
 
-  desc 'Drop the sqlite test databases'
-  task :drop_databases => :load_connection do 
+  desc 'Drop the sqlite test database'
+  task :drop_database => :load_connection do 
     dbfile = connection_string
     sh %{ rm -f #{dbfile} }
   end
 
-  desc 'Rebuild the sqlite test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
+  desc 'Rebuild the sqlite test database'
+  task :rebuild_database => [:drop_database, :build_database]
 
   task :load_connection do
     require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")

data/test/connections/databases.example.yml

@@ -3,13 +3,13 @@
 #  2. Update to match the databases you want to test against.
 
 mysql:
-  adapter: mysql
+  adapter: mysql2
   username: root
   database: composite_primary_keys_unittest
 
 sqlite3:
   adapter: sqlite3
-  database: db/composite_primary_keys_unittest.sqlite3
+  database: db/composite_primary_keys_unittest.sqlite
 
 postgresql:
   adapter: postgresql

data/test/connections/databases.yml

@@ -5,12 +5,12 @@
 mysql:
   adapter: mysql2
   username: root
-  password: mysql
+  password: root
   database: composite_primary_keys_unittest
 
 sqlite3:
   adapter: sqlite3
-  database: db/composite_primary_keys_unittest.sqlite3
+  database: db/composite_primary_keys_unittest.sqlite
 
 postgresql:
   adapter: postgresql

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,7 +1,5 @@
-create sequence public.reference_types_seq start 1000;
-
 create table reference_types (
-    reference_type_id int         default nextval('public.reference_types_seq'),
+    reference_type_id serial not null,
     type_label        varchar(50) default null,
     abbreviation      varchar(50) default null,
     description       varchar(50) default null,
@@ -17,10 +15,8 @@ create table reference_codes (
     primary key (reference_type_id, reference_code)
 );
 
-create sequence public.products_seq start 1000;
-
 create table products (
-    id   int         not null default nextval('public.products_seq'),
+    id serial not null,
     name varchar(50) default null,
     primary key (id)
 );
@@ -46,46 +42,36 @@ create table suburbs (
     primary key (city_id, suburb_id)
 );
 
-create sequence public.streets_seq start 1000;
-
 create table streets (
-    id        int         not null default nextval('public.streets_seq'),
+    id        serial      not null,
     city_id   int         not null,
     suburb_id int         not null,
     name      varchar(50) not null,
     primary key (id)
 );
 
-create sequence public.users_seq start 1000;
-
 create table users (
-    id   int         not null default nextval('public.users_seq'),
+    id   serial not null,
     name varchar(50) not null,
     primary key (id)
 );
 
-create sequence public.articles_seq start 1000;
-
 create table articles (
-    id   int         not null default nextval('public.articles_seq'),
+    id   serial not null,
     name varchar(50) not null,
     primary key (id)
 );
 
-create sequence public.readings_seq start 1000;
-
 create table readings (
-    id         int not null default nextval('public.readings_seq'),
+    id         serial not null,
     user_id    int not null,
     article_id int not null,
     rating     int not null,
     primary key (id)
 );
 
-create sequence public.groups_seq start 1000;
-
 create table groups (
-    id   int         not null default nextval('public.groups_seq'),
+    id   serial not null,
     name varchar(50) not null,
     primary key (id)
 );
@@ -96,10 +82,8 @@ create table memberships (
     primary key (user_id, group_id)
 );
 
-create sequence public.membership_statuses_seq start 1000;
-
 create table membership_statuses (
-    id       int         not null default nextval('public.membership_statuses_seq'),
+    id       serial not null,
     user_id  int         not null,
     group_id int         not null,
     status   varchar(50) not null,
@@ -112,29 +96,23 @@ create table departments (
     primary key (department_id, location_id)
 );
 
-create sequence public.employees_seq start 1000;
-
 create table employees (
-    id            int not null default nextval('public.employees_seq'),
+    id            serial not null,
     department_id int default null,
     location_id   int default null,
     primary key (id)
 );
 
-create sequence public.comments_seq start 1000;
-
 create table comments (
-    id          int          not null default nextval('public.comments_seq'),
+    id          serial not null,
     person_id   int          default null,
     person_type 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'),
+    id serial not null,
     name varchar(50) not null,
     primary key (id)
 );
@@ -153,10 +131,8 @@ create table restaurants_suburbs (
     suburb_id    int not null
 );
 
-create sequence public.dorms_seq start 1000;
-
 create table dorms (
-    id int not null default nextval('public.dorms_seq'),
+    id serial not null,
     primary key (id)
 );
 
@@ -166,10 +142,8 @@ create table rooms (
     primary key (dorm_id, room_id)
 );
 
-create sequence public.room_attributes_seq start 1000;
-
 create table room_attributes (
-    id   int not null default nextval('public.room_attributes_seq'),
+    id   serial not null,
     name varchar(50),
     primary key (id)
 );
@@ -180,10 +154,8 @@ create table room_attribute_assignments (
     room_attribute_id int not null
 );
 
-create sequence public.students_seq start 1000;
-
 create table students (
-    id int not null default nextval('public.students_seq'),
+    id serial not null,
     primary key (id)
 );
 
@@ -210,5 +182,4 @@ create table products_restaurants (
   product_id int not null,
   franchise_id int not null,
   store_id int not null
-);
-  
+);

data/test/test_associations.rb

@@ -176,6 +176,13 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal({:department_id=>[1, 2]}, steve.changes)
   end
 
+  def test_composite_belongs_to__setting_to_nil
+    room_assignment = room_assignments(:jacksons_room)
+    # This was raising an error before:
+    #   NoMethodError: undefined method `length' for nil:NilClass
+    assert_nothing_raised { room_assignment.room = nil }
+  end
+
   def test_has_one_with_composite
     # In this case a regular model has_one composite model
     department = departments(:engineering)

data/test/test_calculations.rb

@@ -17,7 +17,12 @@ class TestCalculations < ActiveSupport::TestCase
 
   def test_count_distinct
     product = products(:first_product)
-    assert_equal(2, product.product_tariffs.count(:distinct => true))
+    assert_equal(1, product.product_tariffs.select('tariff_start_date').count(:distinct => true))
+  end
+  
+  def test_count_not_distinct
+    product = products(:first_product)
+    assert_equal(2, product.product_tariffs.select('tariff_start_date').count(:distinct => false))
   end
 
   def test_count_includes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord