composite_primary_keys 5.0.0.rc1 → 5.0.0

data/History.txt

@@ -1,3 +1,18 @@
+== 5.0.0 2012-02-12
+* Fix tests so they pass on MySql (Charlie Savage)
+* Fix calculations to work with duplicate column names (cleesmith)
+* Switch rake tasks for Postgresql and MySql to use ActiveRecord API for
+  creating and dropping databases (Charlie Savage)
+* Follow AR 3.2 lead and introduce self.primary_keys and deprecate set_primary_keys (Charlie Savage)
+* Switch from set_primary_key to self.primary_key= to avoid Rails deprecation (Charlie Savage)
+* Fix issue when using multiple database connections (David Doan)
+* Fix homepage in gemspec and remove email address (Charlie Savage)
+* Add support for string keys to exists? (Jan Vlnas)
+* Fix typo (Jason Karns)
+
+== 5.0.0.rc1 2012-01-16
+* ActiveRecord 3.2 support
+
 == 4.1.2 2012-01-12
 * Helper to allow the same tests to be used for both Oracle and other DBs
 by replacing quoted identifiers with all-caps equivalents on Oracle (Rhett Sutphin)

data/lib/composite_primary_keys.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Nic Williams
+# Copyright (c) 2006-2012 Nic Williams and Charlie Savage
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 3.2.0.rc2'
+  gem 'activerecord', '~> 3.2.0'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/base.rb

@@ -7,16 +7,17 @@ module ActiveRecord
     NOT_IMPLEMENTED_YET        = 'Not implemented for composite primary keys yet'
 
     class << self
-      def set_primary_keys(*keys)
-        keys = keys.first if keys.first.is_a?(Array)
+      def primary_keys
+        @primary_keys
+      end
 
-        if keys.length == 1
-          set_primary_key(keys.first)
+      def primary_keys=(keys)
+        unless keys.kind_of?(Array)
+          self.primary_key = keys
           return
         end
 
-        cattr_accessor :primary_keys
-        self.primary_keys = keys.map { |k| k.to_sym }.to_composite_keys
+        @primary_keys = keys.map { |k| k.to_sym }.to_composite_keys
 
         class_eval <<-EOV
           extend  CompositeClassMethods
@@ -24,6 +25,19 @@ module ActiveRecord
         EOV
       end
 
+      def set_primary_keys(*keys)
+        ActiveSupport::Deprecation.warn(
+            "Calling self.primary_keys = is deprecated. Please use `self.primary_keys = keys` instead."
+        )
+
+        keys = keys.first if keys.first.is_a?(Array)
+        if keys.length == 1
+          self.primary_key = keys.first
+        else
+          self.primary_keys = keys
+        end
+     end
+
       def composite?
         false
       end
@@ -107,7 +121,7 @@ module ActiveRecord
         unless ids.is_a?(Array) and ids.length == self.class.primary_keys.length
           raise "#{self.class}.id= requires #{self.class.primary_keys.length} ids"
         end
-        [primary_keys, ids].transpose.each {|key, an_id| write_attribute(key , an_id)}
+        [self.class.primary_keys, ids].transpose.each {|key, an_id| write_attribute(key , an_id)}
         id
       end
 
@@ -120,7 +134,7 @@ module ActiveRecord
       end
 
       # Returns this record's primary keys values in an Array
-      # if any value is avaliable
+      # if any value is available
       def to_key
         ids.to_a if !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
       end

data/lib/composite_primary_keys/composite_predicates.rb

@@ -7,12 +7,25 @@ module CompositePrimaryKeys
         Arel::Nodes::And.new(predicates)
       end
     end
-    
-    def cpk_or_predicate(predicates)
-      # Can't do or here, arel does the wrong thing and makes a really
-      # deeply nested stack that blows up
+
+    def figure_engine(table)
+      case table
+        when Arel::Nodes::TableAlias
+          table.left.engine
+        when Arel::Table
+          table.engine
+        when ::ActiveRecord::Base
+          table
+        else
+          nil
+      end
+    end
+
+    def cpk_or_predicate(predicates, table = nil)
+      engine = figure_engine(table)
       predicates = predicates.map do |predicate|
-        "(#{predicate.to_sql})"
+        predicate_sql = engine ? predicate.to_sql(engine) : predicate.to_sql
+        "(#{predicate_sql})"
       end
       predicates = "(#{predicates.join(" OR ")})"
       Arel::Nodes::SqlLiteral.new(predicates)
@@ -43,7 +56,7 @@ module CompositePrimaryKeys
         cpk_and_predicate(eq_predicates)
       end
 
-      cpk_or_predicate(and_predicates)
+      cpk_or_predicate(and_predicates, table)
     end
   end
 end

data/lib/composite_primary_keys/relation/calculations.rb

@@ -1,6 +1,19 @@
 module CompositePrimaryKeys
   module ActiveRecord
     module Calculations
+      def aggregate_column(column_name)
+        # CPK
+        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 ? "*" : column_name.to_s)
+        end
+      end
+
       def execute_simple_calculation(operation, column_name, distinct)
         # Postgresql doesn't like ORDER BY when there are no GROUP BY
         relation = reorder(nil)
@@ -33,8 +46,18 @@ module CompositePrimaryKeys
         # CPK
         # aliased_column = aggregate_column(column_name == :all ? 1 : column_name).as(column_alias)
         # relation.select_values = [aliased_column]
-        column = aggregate_column(column_name)
-        relation.select_values = ["DISTINCT #{column.to_s}"]
+        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
+
+
+        relation.distinct(true)
         subquery = relation.arel.as(subquery_alias)
 
         sm = Arel::SelectManager.new relation.engine

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -56,9 +56,11 @@ module CompositePrimaryKeys
         when CompositePrimaryKeys::CompositeKeys
           relation = relation.where(cpk_id_predicate(table, primary_key, id))
         when Array
-          if !id.first.kind_of?(String)
+          pk_length = @klass.primary_keys.length
+
+          if id.length == pk_length # E.g. id = ['France', 'Paris']
             return self.exists?(id.to_composite_keys)
-          else
+          else # Assume that id contains where relation
             relation = relation.where(id)
           end
         when Hash
@@ -80,8 +82,10 @@ module CompositePrimaryKeys
         #   find('1,2', '3,4')      ->  ['1,2','3,4']
 
         # Normalize incoming data.  Note the last arg can be nil.  Happens
-        # when find is called with nil options like the reload method does.
+        # when find is called with nil options which is then passed on
+        # to find_with_ids.
         ids.compact!
+
         ids = [ids] unless ids.first.kind_of?(Array)
 
         results = ids.map do |cpk_ids|

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/mysql.rake

@@ -2,20 +2,30 @@ 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'
+  task :create_database do
+    ActiveRecord::Base.clear_all_connections!
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql'].dup
+    database_name = spec.delete('database')
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.create_database(database_name)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
   desc 'Build the MySQL test databases'
-  task :build_databases => :load_connection do 
-    options_str = connection_string
-    # creates something like "-u#{username} -p#{password} -S#{socket}"
-    sh %{ mysqladmin #{options_str} create "#{SPEC['database']}" }
+  task :build_databases => [:create_database] do
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
 
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
-    sh %{ mysql #{options_str} "#{SPEC['database']}" < #{schema} }
+    Rake::Task['mysql:load_connection'].invoke
+    ActiveRecord::Base.connection.execute(sql)
   end
 
   desc 'Drop the MySQL test databases'
-  task :drop_databases => :load_connection do 
-    options_str = connection_string
-    sh %{ mysqladmin #{options_str} -f drop "#{SPEC['database']}" }
+  task :drop_databases => :load_connection do
+    ActiveRecord::Base.connection.drop_database(SPEC['database'])
   end
 
   desc 'Rebuild the MySQL test databases'

data/tasks/databases/postgresql.rake

@@ -2,17 +2,37 @@ 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'
+  task :create_database do
+    ActiveRecord::Base.clear_all_connections!
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
+    database_name = spec.delete('database')
+    spec['database'] = 'postgres'
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.create_database(database_name)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
   desc 'Build the PostgreSQL test databases'
-  task :build_databases => :load_connection do
-    sh %{ createdb #{connection_string} "#{SPEC['database']}" }
+  task :build_databases => [:create_database] do
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
 
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sh %{ psql #{connection_string} "#{SPEC['database']}" -f #{schema} }
+    Rake::Task['postgresql:load_connection'].invoke
+    ActiveRecord::Base.connection.execute(sql)
   end
 
   desc 'Drop the PostgreSQL test databases'
-  task :drop_databases => :load_connection do 
-    sh %{ dropdb #{connection_string} "#{SPEC['database']}" }
+  task :drop_databases => :load_connection do
+    ActiveRecord::Base.clear_all_connections!
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
+    database_name = spec.delete('database')
+    spec['database'] = 'postgres'
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.drop_database(SPEC['database'])
+    ActiveRecord::Base.clear_all_connections!
   end
 
   desc 'Rebuild the PostgreSQL test databases'

data/test/abstract_unit.rb

@@ -9,11 +9,13 @@ require 'composite_primary_keys'
 
 # Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
-spec = CompositePrimaryKeys::ConnectionSpec[ENV['ADAPTER'] || 'postgresql']
+
+spec_name = ENV['ADAPTER'] || 'postgresql'
+spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
 
 # And now connect to the database
 adapter = spec['adapter']
-require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
+require File.join(PROJECT_ROOT, "test", "connections", "native_#{spec_name}", "connection")
 
 # Tell active record about the configuration
 ActiveRecord::Base.configurations[:test] = spec

data/test/connections/databases.yml

@@ -3,8 +3,9 @@
 #  2. Update to match the databases you want to test against.
 
 mysql:
-  adapter: mysql
+  adapter: mysql2
   username: root
+  password: mysql
   database: composite_primary_keys_unittest
 
 sqlite3:

data/test/db_test.rb

@@ -24,7 +24,7 @@ end
 module GlobePG
   class TeacherToSchool < PGBase
     set_table_name 'teacher_to_school'
-    set_primary_keys ['teacherid', 'schoolid']
+    self.primary_keys = ['teacherid', 'schoolid']
 
     belongs_to :globe_teacher, :foreign_key => 'teacherid'
     belongs_to :globe_school, :foreign_key => 'schoolid'
@@ -34,7 +34,7 @@ end
 module GlobePG
   class GlobeSchool < PGBase
     set_table_name 'globe_school'
-    set_primary_key 'schoolid'
+    self.primary_key = 'schoolid'
     has_many :teacher_to_schools, :foreign_key => :schoolid
     has_many :globe_teachers, :through => :teacher_to_schools
   end
@@ -43,7 +43,7 @@ end
 module GlobePG
   class GlobeTeacher < PGBase
     set_table_name 'globe_teacher'
-    set_primary_key 'teacherid'
+    self.primary_key = 'teacherid'
     has_many :teacher_to_schools, :foreign_key => :teacherid
     has_many :globe_schools, :through => :teacher_to_schools
   end

data/test/fixtures/capitol.rb

@@ -1,3 +1,3 @@
 class Capitol < ActiveRecord::Base
-  set_primary_keys :country, :city
+  self.primary_keys = :country, :city
 end

data/test/fixtures/db_definitions/mysql.sql

@@ -1,186 +1,186 @@
 create table reference_types (
-    reference_type_id int(11) not null auto_increment,
+    reference_type_id int not null auto_increment,
     type_label varchar(50) default null,
     abbreviation varchar(50) default null,
     description varchar(50) default null,
     primary key (reference_type_id)
-) type=InnoDB;
+);
 
 create table reference_codes (
-    reference_type_id int(11),
-    reference_code int(11) not null,
+    reference_type_id int not null,
+    reference_code int not null,
     code_label varchar(50) default null,
     abbreviation varchar(50) default null,
     description varchar(50) default null,
     primary key (reference_type_id, reference_code)
-) type=InnoDB;
+);
 
 create table products (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     name varchar(50) default null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table tariffs (
-    tariff_id int(11) not null,
+    tariff_id int not null,
     start_date date not null,
     amount integer(11) default null,
     primary key (tariff_id, start_date)
-) type=InnoDB;
+);
 
 create table product_tariffs (
-    product_id int(11) not null,
-    tariff_id int(11) not null,
+    product_id int not null,
+    tariff_id int not null,
     tariff_start_date date not null,
     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,
+    city_id int not null,
+    suburb_id int 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,
+    id int not null auto_increment,
+    city_id int not null,
+    suburb_id int not null,
     name varchar(50) not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table users (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     name varchar(50) not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table articles (
-    id int(11) not null auto_increment,
+    id int 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,
+    id int not null auto_increment,
+    user_id int not null,
+    article_id int not null,
+    rating int not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table groups (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     name varchar(50) not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table memberships (
-    user_id int(11) not null,
-    group_id int(11) not null,
+    user_id int not null,
+    group_id int not null,
     primary key  (user_id,group_id)
-) type=InnoDB;
+);
 
 create table membership_statuses (
-    id int(11) not null auto_increment,
-    user_id int(11) not null,
-    group_id int(11) not null,
+    id int not null auto_increment,
+    user_id int not null,
+    group_id int not null,
     status varchar(50) not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table departments (
-    department_id int(11) not null,
-    location_id int(11) not null,
+    department_id int not null,
+    location_id int not null,
     primary key (department_id, location_id)
-) type=InnoDB;
+);
 
 create table employees (
-    id int(11) not null auto_increment,
-    department_id int(11) default null,
-    location_id int(11) default null,
+    id int not null auto_increment,
+    department_id int default null,
+    location_id int default null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table comments (
-    id int(11) not null auto_increment,
-    person_id int(11) default null,
+    id int not null auto_increment,
+    person_id int default null,
     person_type varchar(100) default null,
-    hack_id int(11) default null,
+    hack_id int default null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table hacks (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     name varchar(50) not null,
     primary key (id)
-) type=InnoDB;
+);
 
 create table restaurants (
-    franchise_id int(11) not null,
-    store_id int(11) not null,
+    franchise_id int not null,
+    store_id int not null,
     name varchar(100),
     primary key (franchise_id, store_id)
-) type=InnoDB;
+);
 
 create table restaurants_suburbs (
-    franchise_id int(11) not null,
-    store_id int(11) not null,
-    city_id int(11) not null,
-    suburb_id int(11) not null
-) type=InnoDB;
+    franchise_id int not null,
+    store_id int not null,
+    city_id int not null,
+    suburb_id int not null
+);
 
 create table dorms (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     primary key(id)
-) type=InnoDB;
+);
 
 create table rooms (
-    dorm_id int(11) not null,
-    room_id int(11) not null,
+    dorm_id int not null,
+    room_id int not null,
     primary key (dorm_id, room_id)
-) type=InnoDB;
+);
 
 create table room_attributes (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     name varchar(50),
     primary key(id)
-) type=InnoDB;
+);
 
 create table room_attribute_assignments (
-    dorm_id int(11) not null,
-    room_id int(11) not null,
-    room_attribute_id int(11) not null
-) type=InnoDB;
+    dorm_id int not null,
+    room_id int not null,
+    room_attribute_id int not null
+);
 
 create table students (
-    id int(11) not null auto_increment,
+    id int not null auto_increment,
     primary key(id)
-) type=InnoDB;
+);
 
 create table room_assignments (
-    student_id int(11) not null,
-    dorm_id int(11) not null,
-    room_id int(11) not null
-) type=InnoDB;
+    student_id int not null,
+    dorm_id int not null,
+    room_id int not null
+);
 
 create table seats (
-  flight_number int(11) not null,
-  seat          int(11) not null,
+  flight_number int not null,
+  seat          int not null,
   customer      int,
   primary key (flight_number, seat)
-) type=InnoDB;
+);
 
 create table capitols (
   country varchar(100) default null,
   city varchar(100) default null,
   primary key (country, city)
-) type=InnoDB;
+);
 
 create table products_restaurants (
-  product_id int(11) not null,
-  franchise_id int(11) not null,
-  store_id int(11) not null
-) type=InnoDB;
+  product_id int not null,
+  franchise_id int not null,
+  store_id int not null
+);
 

data/test/fixtures/department.rb

@@ -1,5 +1,5 @@
 class Department < ActiveRecord::Base
-  set_primary_keys :department_id, :location_id
+  self.primary_keys = :department_id, :location_id
   has_many :employees, :foreign_key => [:department_id, :location_id]
   has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
 end

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
 class Dorm < ActiveRecord::Base
-  has_many :rooms, :include => :room_attributes,  :primary_key => [:id]
+  has_many :rooms, :include => :room_attributes, :primary_key => [:id]
 end

data/test/fixtures/membership.rb

@@ -1,6 +1,6 @@
 class Membership < ActiveRecord::Base
-  # set_primary_keys *keys - turns on composite key functionality
-  set_primary_keys :user_id, :group_id
+  # self.primary_keys = *keys - turns on composite key functionality
+  self.primary_keys = :user_id, :group_id
   belongs_to :user
 	belongs_to :group
 	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]

data/test/fixtures/product.rb

@@ -1,5 +1,5 @@
 class Product < ActiveRecord::Base
-	set_primary_keys :id  # redundant
+	self.primary_keys = :id  # redundant
 	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
 	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
 

data/test/fixtures/product_tariff.rb

@@ -1,5 +1,5 @@
 class ProductTariff < ActiveRecord::Base
-	set_primary_keys :product_id, :tariff_id, :tariff_start_date
+	self.primary_keys = :product_id, :tariff_id, :tariff_start_date
 	belongs_to :product, :foreign_key => :product_id
 	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
 end

data/test/fixtures/reference_code.rb

@@ -1,5 +1,5 @@
 class ReferenceCode < ActiveRecord::Base
-  set_primary_keys :reference_type_id, :reference_code
+  self.primary_keys = :reference_type_id, :reference_code
   
   belongs_to :reference_type, :foreign_key => "reference_type_id"
   

data/test/fixtures/reference_type.rb

@@ -1,5 +1,5 @@
 class ReferenceType < ActiveRecord::Base
-  set_primary_key :reference_type_id
+  self.primary_key = :reference_type_id
   has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
   
   validates_presence_of :type_label, :abbreviation

data/test/fixtures/restaurant.rb

@@ -1,5 +1,5 @@
 class Restaurant < ActiveRecord::Base
-  set_primary_keys :franchise_id, :store_id
+  self.primary_keys = :franchise_id, :store_id
   has_and_belongs_to_many :suburbs, 
     :foreign_key => [:franchise_id, :store_id],  
     :association_foreign_key => [:city_id, :suburb_id]

data/test/fixtures/room.rb

@@ -1,5 +1,5 @@
 class Room < ActiveRecord::Base
-  set_primary_keys :dorm_id, :room_id
+  self.primary_keys = :dorm_id, :room_id
   belongs_to :dorm
   has_many :room_assignments, :foreign_key =>  [:dorm_id, :room_id]
   has_many :room_attribute_assignments, :foreign_key =>  [:dorm_id, :room_id]

data/test/fixtures/room_assignment.rb

@@ -1,5 +1,5 @@
 class RoomAssignment < ActiveRecord::Base
-  set_primary_keys :student_id, :dorm_id, :room_id
+  self.primary_keys = :student_id, :dorm_id, :room_id
   belongs_to :student
   belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
 

data/test/fixtures/room_attribute_assignment.rb

@@ -1,5 +1,5 @@
 class RoomAttributeAssignment < ActiveRecord::Base
-  set_primary_keys :dorm_id, :room_id, :room_attribute_id
+  self.primary_keys = :dorm_id, :room_id, :room_attribute_id
   belongs_to :room, :foreign_key => [:dorm_id, :room_id]
   belongs_to :room_attribute
 end

data/test/fixtures/seat.rb

@@ -1,5 +1,5 @@
 class Seat < ActiveRecord::Base
-  set_primary_keys [:flight_number, :seat]
+  self.primary_keys = [:flight_number, :seat]
 
   validates_uniqueness_of :customer
 end

data/test/fixtures/suburb.rb

@@ -1,5 +1,5 @@
 class Suburb < ActiveRecord::Base
-  set_primary_keys :city_id, :suburb_id
+  self.primary_keys = :city_id, :suburb_id
   has_many :streets,  :foreign_key => [:city_id, :suburb_id]
   has_many :first_streets,  :foreign_key => [:city_id, :suburb_id], 
           :class_name => 'Street', :conditions => "streets.name = 'First Street'"

data/test/fixtures/tariff.rb

@@ -1,5 +1,5 @@
 class Tariff < ActiveRecord::Base
-	set_primary_keys [:tariff_id, :start_date]
+	self.primary_keys = [:tariff_id, :start_date]
 	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
 	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
 end

data/test/test_associations.rb

@@ -5,27 +5,6 @@ class TestAssociations < ActiveSupport::TestCase
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
            :departments, :employees, :memberships, :membership_statuses
   
-  def test_count
-    assert_equal(3, Product.count(:include => :product_tariffs))
-    assert_equal(3, Tariff.count(:include => :product_tariffs))
-
-    expected = {Date.today => 2,
-                Date.today.next => 1}
-
-    assert_equal(expected, Tariff.count(:group => :start_date))
-  end
-
-  def test_count_distinct
-    product = products(:first_product)
-    assert_equal(2, product.product_tariffs.count(:distinct => true))
-  end
-  
-  def test_count_includes
-    count = Dorm.count(:include => :rooms,
-                       :conditions => ["rooms.room_id = ?", 2])
-    assert_equal(1, count)
-  end
-
   def test_products
     assert_not_nil products(:first_product).product_tariffs
     assert_equal 2, products(:first_product).product_tariffs.length

data/test/test_calculations.rb

@@ -0,0 +1,33 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
+           :departments, :employees, :memberships, :membership_statuses
+
+  def test_count
+    assert_equal(3, Product.count(:include => :product_tariffs))
+    assert_equal(3, Tariff.count(:include => :product_tariffs))
+
+    expected = {Date.today => 2,
+                Date.today.next => 1}
+
+    assert_equal(expected, Tariff.count(:group => :start_date))
+  end
+
+  def test_count_distinct
+    product = products(:first_product)
+    assert_equal(2, product.product_tariffs.count(:distinct => true))
+  end
+
+  def test_count_includes
+    count = Dorm.count(:include => :rooms,
+                       :conditions => ["rooms.room_id = ?", 2])
+    assert_equal(1, count)
+  end
+
+  def test_count_includes_dup_columns
+    count = Tariff.includes(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
+    assert_equal(1, count)
+  end
+end

data/test/test_exists.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestExists < ActiveSupport::TestCase
-  fixtures :articles, :departments
+  fixtures :articles, :departments, :capitols
   
   def test_id
     assert(Article.exists?(1))
@@ -32,4 +32,9 @@ class TestExists < ActiveSupport::TestCase
     assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
     assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
   end
+
+  def test_cpk_array_string_id
+    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
+    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
+  end
 end

data/test/test_find.rb

@@ -50,7 +50,13 @@ class TestFind < ActiveSupport::TestCase
     error = assert_raise(::ActiveRecord::RecordNotFound) do
       ReferenceCode.find(['999', '999'])
     end
-    assert_equal(with_quoted_identifiers("Couldn't find ReferenceCode with ID=999,999 WHERE \"reference_codes\".\"reference_type_id\" = 999 AND \"reference_codes\".\"reference_code\" = 999"),
+
+    connection = ActiveRecord::Base.connection
+    ref_type_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_type_id')}"
+    ref_code_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_code')}"
+    expected = "Couldn't find ReferenceCode with ID=999,999 WHERE #{ref_type_quoted} = 999 AND #{ref_code_quoted} = 999"
+
+    assert_equal(with_quoted_identifiers(expected),
                  error.message)
   end
 

data/test/test_miscellaneous.rb

@@ -29,9 +29,4 @@ class TestMiscellaneous < ActiveSupport::TestCase
       assert_equal composite?, @first.composite?
     end
   end
-  
-  def test_count
-    assert_equal 3, Product.count
-  end
-  
 end

data/test/test_predicates.rb

@@ -14,9 +14,12 @@ class TestEqual < ActiveSupport::TestCase
       predicates << dep[:id].eq(i)
     end
 
+    connection = ActiveRecord::Base.connection
+    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+    expected = "((#{quoted} = 0) OR (#{quoted} = 1) OR (#{quoted} = 2))"
+
     pred = cpk_or_predicate(predicates)
-    assert_equal(with_quoted_identifiers('(("departments"."id" = 0) OR ("departments"."id" = 1) OR ("departments"."id" = 2))'),
-                 pred)
+    assert_equal(with_quoted_identifiers(expected), pred.to_s)
   end
 
   def test_and
@@ -28,8 +31,11 @@ class TestEqual < ActiveSupport::TestCase
       predicates << dep[:id].eq(i)
     end
 
+    connection = ActiveRecord::Base.connection
+    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+    expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
+
     pred = cpk_and_predicate(predicates)
-    assert_equal(with_quoted_identifiers('"departments"."id" = 0 AND "departments"."id" = 1 AND "departments"."id" = 2'),
-                pred.to_sql)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
   end
 end

data/test/test_suite.rb

@@ -4,6 +4,7 @@ require 'test/unit'
   test_associations
   test_attribute_methods
   test_attributes
+  test_calculations
   test_composite_arrays
   test_create
   test_delete

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
-  prerelease: 6
+  version: 5.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -10,22 +10,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &24769260 !ruby/object:Gem::Requirement
+  requirement: &24424140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *24769260
-description: Composite key support for ActiveRecord 3
-email:
-- drnicwilliams@gmail.com
+  version_requirements: *24424140
+description: Composite key support for ActiveRecord
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -154,6 +153,7 @@ files:
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_calculations.rb
 - test/test_composite_arrays.rb
 - test/test_create.rb
 - test/test_delete.rb
@@ -172,7 +172,7 @@ files:
 - test/test_tutorial_example.rb
 - test/test_update.rb
 - test/test_validations.rb
-homepage: http://github.com/cfis/composite_primary_keys
+homepage: https://github.com/drnic/composite_primary_keys
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -187,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: compositekeys
 rubygems_version: 1.8.15
@@ -205,6 +205,7 @@ test_files:
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_calculations.rb
 - test/test_composite_arrays.rb
 - test/test_create.rb
 - test/test_delete.rb