composite_primary_keys 8.1.4 → 8.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ca795714eef0beaa1a0e91a07b09b1735b12242
-  data.tar.gz: 41e87e3f7ae758e975809e56d8c7a3396d604f4c
+  metadata.gz: abff4d9e394b49dc7b5202df306d247ac92cbcd4
+  data.tar.gz: f0faa4bff366aba7dd02ce375eb1ba69b0b33cff
 SHA512:
-  metadata.gz: 1f142511ba73692d9599bafdf78b26e61405a76b34b4de455f313a248fec5b6a75240f56eb9f6ef87ec299edd9db3ac5fc2b7849e51ed84b1efb16e852fa62c5
-  data.tar.gz: ebf3f4281ee1c7c372a8b035a2e7a2a8651f7972a673c38555de38449b05d781696971eb7f507f912322c4527a28664216d4f8c69cfaafb5d11f09a71c8aea20
+  metadata.gz: 25822213d2b20007dfa81137f7504e6df9b86b75e41592bf9adfb75ef903c234d3d5dcda2a4df8a82a0579701b1db8bea0a4320b9db62ce3aae2c96999236d48
+  data.tar.gz: 9734252590c4f158064e6c8f8ef1e695892f97084731639bd5875c9b0f67c18bc51070b3a7cc458b1477a53b85ebcdc915f561735b3f780d147fd9d77affd0e5

data/History.rdoc

@@ -1,3 +1,7 @@
+== 8.1.5 (2017-01-01)
+
+* Don't nest PK twice when looking up id, fixes #319 (Kerey Roper)
+
 == 8.1.4 (2016-07-27)
 
 * Create OR predicates in a nicely balanced tree fixing #320 (Nathan Samson)

data/Rakefile

@@ -1,34 +1,34 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rubygems/package_task'
-
-# Set global variable so other tasks can access them
-::PROJECT_ROOT = File.expand_path(".")
-::GEM_NAME = 'composite_primary_keys'
-
-# Read the spec file
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup Rake tasks for managing the gem
-Gem::PackageTask.new(spec).define
-
-# Now load in other task files
-Dir.glob('tasks/**/*.rake').each do |rake_file|
-  load File.join(File.dirname(__FILE__), rake_file)
-end
-
-# Set up test tasks for each supported connection adapter
-%w(mysql sqlite3 oracle oracle_enhanced postgresql ibm_db sqlserver).each do |adapter|
-  namespace adapter do
-    desc "Run tests using the #{adapter} adapter"
-    task "test" do
-      ENV["ADAPTER"] = adapter
-      Rake::TestTask.new("subtest_#{adapter}") do |t|
-        t.libs << "test"
-      end
-      Rake::Task["subtest_#{adapter}"].invoke
-    end
-  end
-end
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rubygems/package_task'
+
+# Set global variable so other tasks can access them
+::PROJECT_ROOT = File.expand_path(".")
+::GEM_NAME = 'composite_primary_keys'
+
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+# Setup Rake tasks for managing the gem
+Gem::PackageTask.new(spec).define
+
+# Now load in other task files
+Dir.glob('tasks/**/*.rake').each do |rake_file|
+  load File.join(File.dirname(__FILE__), rake_file)
+end
+
+# Set up test tasks for each supported connection adapter
+%w(mysql sqlite3 oracle oracle_enhanced postgresql ibm_db sqlserver).each do |adapter|
+  namespace adapter do
+    desc "Run tests using the #{adapter} adapter"
+    task "test" do
+      ENV["ADAPTER"] = adapter
+      Rake::TestTask.new("subtest_#{adapter}") do |t|
+        t.libs << "test"
+      end
+      Rake::Task["subtest_#{adapter}"].invoke
+    end
+  end
+end

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -7,7 +7,8 @@ module ActiveRecord
           _read_attribute(attr_name, &block)
         else
           name = attr_name.to_s
-          name = self.class.primary_key if name == 'id'.freeze
+          # CPK
+          name = self.class.primary_key if name == 'id'.freeze && !composite?
           _read_attribute(name, &block)
         end
       end

data/lib/composite_primary_keys/dirty.rb

@@ -1,19 +1,19 @@
-module ActiveModel
-  module Dirty
-    def can_change_primary_key?
-      true
-    end
-
-    def primary_key_changed?
-      !!changed.detect { |key| ids_hash.keys.include?(key.to_s) }
-    end
-
-    def primary_key_was
-      ids_hash.keys.inject(Hash.new) do |result, attribute_name|
-        result[attribute_name] = attribute_was(attribute_name.to_s)
-        result
-      end
-    end
-    alias_method :ids_hash_was, :primary_key_was
-  end
-end
+module ActiveModel
+  module Dirty
+    def can_change_primary_key?
+      true
+    end
+
+    def primary_key_changed?
+      !!changed.detect { |key| ids_hash.keys.include?(key.to_s) }
+    end
+
+    def primary_key_was
+      ids_hash.keys.inject(Hash.new) do |result, attribute_name|
+        result[attribute_name] = attribute_was(attribute_name.to_s)
+        result
+      end
+    end
+    alias_method :ids_hash_was, :primary_key_was
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/mysql.rake

@@ -1,42 +1,42 @@
-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 database'
-  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 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
-    end
-
-    Rake::Task['mysql:load_connection'].reenable
-    Rake::Task['mysql:load_connection'].invoke
-    #puts %(ActiveRecord::Base.connection.instance_variable_get(:@config)=#{(ActiveRecord::Base.connection.instance_variable_get(:@config)).inspect})
-    sql.split(";").each do |statement|
-      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
-    end
-  end
-
-  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 database'
-  task :rebuild_database => [:drop_database, :build_database]
-  
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
-    establish_connection
-  end
-end
+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 database'
+  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 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
+    end
+
+    Rake::Task['mysql:load_connection'].reenable
+    Rake::Task['mysql:load_connection'].invoke
+    #puts %(ActiveRecord::Base.connection.instance_variable_get(:@config)=#{(ActiveRecord::Base.connection.instance_variable_get(:@config)).inspect})
+    sql.split(";").each do |statement|
+      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
+    end
+  end
+
+  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 database'
+  task :rebuild_database => [:drop_database, :build_database]
+  
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
+    establish_connection
+  end
+end

data/tasks/databases/postgresql.rake

@@ -1,48 +1,48 @@
-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 database'
-  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 database'
-  task :build_database => [:create_database] do
-    ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    connection = ActiveRecord::Base.establish_connection(spec)
-
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
-
-    Rake::Task['postgresql:load_connection'].invoke
-    ActiveRecord::Base.connection.execute(sql)
-  end
-
-  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')
-    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 database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")
-  end
+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 database'
+  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 database'
+  task :build_database => [:create_database] do
+    ActiveRecord::Base.clear_all_connections!
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
+    connection = ActiveRecord::Base.establish_connection(spec)
+
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
+
+    Rake::Task['postgresql:load_connection'].invoke
+    ActiveRecord::Base.connection.execute(sql)
+  end
+
+  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')
+    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 database'
+  task :rebuild_database => [:drop_database, :build_database]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")
+  end
 end

data/tasks/databases/sqlite3.rake

@@ -1,27 +1,27 @@
-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 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)
-    FileUtils.mkdir_p(File.dirname(dbfile))
-    cmd = "sqlite3 #{dbfile} < #{schema}"
-    puts cmd
-    sh %{ #{cmd} }
-  end
-
-  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 database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
-  end
-end
+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 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)
+    FileUtils.mkdir_p(File.dirname(dbfile))
+    cmd = "sqlite3 #{dbfile} < #{schema}"
+    puts cmd
+    sh %{ #{cmd} }
+  end
+
+  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 database'
+  task :rebuild_database => [:drop_database, :build_database]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
+  end
+end

data/test/connections/connection_spec.rb

@@ -1,18 +1,18 @@
-require 'yaml'
-
-module CompositePrimaryKeys
-  class ConnectionSpec
-    def self.[](adapter)
-      config[adapter.to_s]
-    end
-
-    private
-
-    def self.config
-      @config ||= begin
-        path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
-        YAML.load_file(path)
-      end
-    end
-  end
-end
+require 'yaml'
+
+module CompositePrimaryKeys
+  class ConnectionSpec
+    def self.[](adapter)
+      config[adapter.to_s]
+    end
+
+    private
+
+    def self.config
+      @config ||= begin
+        path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
+        YAML.load_file(path)
+      end
+    end
+  end
+end

data/test/connections/databases.yml

@@ -1,9 +1,30 @@
-# To run tests:
-#  1. Copy this file to test/connections/databases.yml.
-#  2. Update to match the databases you want to test against.
-#  3. Build the database using rake <databasename>:build_database
+mysql:
+  adapter: mysql2
+  username: root
+  password: mysql
+  database: composite_primary_keys_unittest
+
+oracle:
+  adapter: oracle_enhanced
+  database: xe
+  username: SYSTEM
+  password: oracle
+  host: localhost
+
 postgresql:
   adapter: postgresql
   database: composite_primary_keys_unittest
   username: postgres
   host: localhost
+
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+
+sqlserver:
+  adapter: sqlserver
+  username: cpk
+  password: cpk
+  database: composite_primary_keys_unittest
+  host: localhost
+  port: 1433

data/test/connections/native_ibm_db/connection.rb

@@ -1,19 +1,19 @@
-print "Using IBM2 \n"
-
-gem 'ibm_db'
-require 'IBM_DB'
-
-RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
-
-db1 = 'composite_primary_keys_unittest'
-
-connection_options = {
-  :adapter  => "ibm_db",
-  :database => "ocdpdev",
-  :username => "db2inst1",
-  :password => "password",                      
-  :host => '192.168.2.21'
-}
-
-ActiveRecord::Base.configurations = { db1 => connection_options }
+print "Using IBM2 \n"
+
+gem 'ibm_db'
+require 'IBM_DB'
+
+RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
+
+db1 = 'composite_primary_keys_unittest'
+
+connection_options = {
+  :adapter  => "ibm_db",
+  :database => "ocdpdev",
+  :username => "db2inst1",
+  :password => "password",                      
+  :host => '192.168.2.21'
+}
+
+ActiveRecord::Base.configurations = { db1 => connection_options }
 ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_mysql/connection.rb

@@ -1,17 +1,17 @@
-print "Using native MySQL\n"
-
-def connection_string
-  options = {}
-  options['u'] = SPEC['username']  if SPEC['username']
-  options['p'] = SPEC['password']  if SPEC['password']
-  options['S'] = SPEC['sock']      if SPEC['sock']
-  options.map { |key, value| "-#{key}#{value}" }.join(" ")
-end
-
-# Adapter config setup in test/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
-
-def establish_connection
-  ActiveRecord::Base.establish_connection(SPEC)
-end
-establish_connection
+print "Using native MySQL\n"
+
+def connection_string
+  options = {}
+  options['u'] = SPEC['username']  if SPEC['username']
+  options['p'] = SPEC['password']  if SPEC['password']
+  options['S'] = SPEC['sock']      if SPEC['sock']
+  options.map { |key, value| "-#{key}#{value}" }.join(" ")
+end
+
+# Adapter config setup in test/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(SPEC)
+end
+establish_connection

data/test/connections/native_postgresql/connection.rb

@@ -1,13 +1,13 @@
-print "Using native Postgresql\n"
-
-def connection_string
-  options = Hash.new
-  options['U'] = SPEC['username']  if SPEC['username']
-  options['h'] = SPEC['host']  if SPEC['host']
-  options['p'] = SPEC['port']  if SPEC['port']
-  options.map { |key, value| "-#{key} #{value}" }.join(" ")
-end
-
-# Adapter config setup in text/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['postgresql']
+print "Using native Postgresql\n"
+
+def connection_string
+  options = Hash.new
+  options['U'] = SPEC['username']  if SPEC['username']
+  options['h'] = SPEC['host']  if SPEC['host']
+  options['p'] = SPEC['port']  if SPEC['port']
+  options.map { |key, value| "-#{key} #{value}" }.join(" ")
+end
+
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['postgresql']
 ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_sqlite3/connection.rb

@@ -1,9 +1,9 @@
-print "Using native Sqlite3\n"
-
-def connection_string
-  SPEC['database']
-end
-
-# Adapter config setup in text/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['sqlite3']
-ActiveRecord::Base.establish_connection(SPEC)
+print "Using native Sqlite3\n"
+
+def connection_string
+  SPEC['database']
+end
+
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['sqlite3']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/fixtures/article.rb

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

data/test/fixtures/db_definitions/postgresql.sql

@@ -218,3 +218,12 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
+
+create table pk_called_ids (
+    id serial 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 (id, reference_code)
+);

data/test/fixtures/pk_called_id.rb

@@ -0,0 +1,5 @@
+class PkCalledId < ActiveRecord::Base
+  self.primary_keys = :id, :reference_code
+
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/pk_called_ids.yml

@@ -0,0 +1,11 @@
+name_prefix_mr:
+  id: 1
+  reference_code: 1
+  code_label: MR
+  abbreviation: Mr
+
+name_prefix_mrs:
+  id: 2
+  reference_code: 1
+  code_label: MRS
+  abbreviation: Mrs

data/test/test_ids.rb

@@ -1,109 +1,113 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class ChildCpkTest < ReferenceCode
-end
-
-class TestIds < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-    :dual_strs   => {
-      :class => ReferenceCode,
-      :primary_keys => ['reference_type_id', 'reference_code'],
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_id
-    testing_with do
-      assert_equal @first.id, @first.ids if composite?
-      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
-    end
-  end
-
-  def test_to_param
-    testing_with do
-      assert_equal '1,1', @first.to_param if composite?
-    end
-  end
-
-  def test_ids_to_s
-    testing_with do
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      to_test = @klass.order(order)[0..1].map(&:id)
-      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
-      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
-    end
-  end
-
-  def test_set_ids_string
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected.to_s
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_array
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_comp
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_primary_keys
-    testing_with do
-      if composite?
-        assert_not_nil @klass.primary_keys
-        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
-        assert_equal @klass.primary_keys, @klass.primary_key
-        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
-        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
-      else
-        assert_not_nil @klass.primary_key
-        assert_equal @primary_keys.first, @klass.primary_key.to_sym
-        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
-      end
-    end
-  end
-
-  def test_inherited_primary_keys
-    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
-  end
-
-  def test_inherited_ids
-    cpk_test = ChildCpkTest.new
-    assert_equal([nil, nil], cpk_test.id)
-  end
-
-  def test_assign_ids
-    ref_code = ReferenceCode.new
-    assert_equal([nil, nil], ref_code.id)
-
-    ref_code.id = [2,1]
-    assert_equal([2,1], ref_code.id)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class ChildCpkTest < ReferenceCode
+end
+
+class TestIds < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :pk_called_ids
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+    :dual_strs   => {
+      :class => ReferenceCode,
+      :primary_keys => ['reference_type_id', 'reference_code'],
+    },
+    :pk_called_id => {
+      :class => PkCalledId,
+      :primary_keys => ['id', 'reference_code'],
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_id
+    testing_with do
+      assert_equal @first.id, @first.ids if composite?
+      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
+    end
+  end
+
+  def test_to_param
+    testing_with do
+      assert_equal '1,1', @first.to_param if composite?
+    end
+  end
+
+  def test_ids_to_s
+    testing_with do
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      to_test = @klass.order(order)[0..1].map(&:id)
+      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
+      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
+    end
+  end
+
+  def test_set_ids_string
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected.to_s
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_array
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_comp
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_primary_keys
+    testing_with do
+      if composite?
+        assert_not_nil @klass.primary_keys
+        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
+        assert_equal @klass.primary_keys, @klass.primary_key
+        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
+        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
+      else
+        assert_not_nil @klass.primary_key
+        assert_equal @primary_keys.first, @klass.primary_key.to_sym
+        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
+      end
+    end
+  end
+
+  def test_inherited_primary_keys
+    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
+  end
+
+  def test_inherited_ids
+    cpk_test = ChildCpkTest.new
+    assert_equal([nil, nil], cpk_test.id)
+  end
+
+  def test_assign_ids
+    ref_code = ReferenceCode.new
+    assert_equal([nil, nil], ref_code.id)
+
+    ref_code.id = [2,1]
+    assert_equal([2,1], ref_code.id)
+  end
+end

data/test/test_update.rb

@@ -62,10 +62,12 @@ class TestUpdate < ActiveSupport::TestCase
 
   def test_update_all
     assert_nothing_raised do
-      reference_code = ReferenceCode.create
+      reference_code = ReferenceCode.first
       primary_key = reference_code.class.primary_key
-      ReferenceCode.where(primary_key => reference_code[primary_key]).
-        update_all(description: 'random value')
+      ReferenceCode.where(primary_key => reference_code[primary_key]).update_all(description: 'random value')
+
+      reference_code.reload
+      assert_equal('random value', reference_code.description)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.1.4
+  version: 8.1.5
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,6 +172,8 @@ files:
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
+- test/fixtures/pk_called_id.rb
+- test/fixtures/pk_called_ids.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -269,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord