composite_primary_keys 12.0.2 → 12.0.7

data/test/test_create.rb

@@ -48,16 +48,30 @@ class TestCreate < ActiveSupport::TestCase
     end
   end
 
-  # def test_create_generated_keys
-  #   # Not all databases support columns with multiple identity fields
-  #   if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) ||
-  #      defined?(ActiveRecord::ConnectionAdapters::SQLite3)
-  #
-  #     suburb = Suburb.create!(:name => 'Capitol Hill')
-  #     refute_nil(suburb.city_id)
-  #     refute_nil(suburb.suburb_id)
-  #   end
-  # end
+  def test_create_with_array
+    date = Date.new(2027, 01, 27)
+    tariff = Tariff.create!(id: [10, date], amount: 27)
+    refute_nil(tariff)
+    assert_equal([10, date], tariff.id)
+    assert_equal(date, tariff.start_date)
+    assert_equal(27, tariff.amount)
+  end
+
+  def test_create_with_partial_serial
+    attributes = {:location_id => 100}
+
+    # SQLite does not support an autoincrementing field in a composite key
+    if Department.connection.class.name == "ActiveRecord::ConnectionAdapters::SQLite3Adapter"
+      attributes[:id] = 200
+    end
+
+    department = Department.new(attributes)
+    assert_nil(department.attributes[:id])
+
+    department.save!
+    refute_nil(department.attributes["id"])
+    assert_equal(100, department.location_id)
+  end
 
   def test_create_on_association
     suburb = Suburb.first
@@ -165,14 +179,6 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(assignment2, room.room_assignments[1])
   end
 
-  def test_create_article_invalid_id
-    error = assert_raises(ActiveRecord::RecordInvalid) do
-      Article.create!(:id => 1)
-    end
-
-    assert_equal('Validation failed: Id has already been taken', error.to_s)
-  end
-
   def test_find_or_create_by
     suburb = Suburb.find_by(:city_id => 3, :suburb_id => 1)
     assert_nil(suburb)
@@ -180,4 +186,21 @@ class TestCreate < ActiveSupport::TestCase
     suburb = Suburb.find_or_create_by!(:name => 'New Suburb', :city_id => 3, :suburb_id => 1)
     refute_nil(suburb)
   end
+
+  def test_cache
+    Suburb.cache do
+      # Suburb does not exist
+      suburb = Suburb.find_by(:city_id => 10, :suburb_id => 10)
+      assert_nil(suburb)
+
+      # Create it
+      suburb = Suburb.create!(:name => 'New Suburb', :city_id => 10, :suburb_id => 10)
+
+      # Should be able to find it
+      suburb = Suburb.find_by(:city_id => 10)
+      refute_nil(suburb)
+      refute_nil(suburb.city_id)
+      refute_nil(suburb.suburb_id)
+    end
+  end
 end

data/test/test_delete.rb

@@ -131,13 +131,13 @@ class TestDelete < ActiveSupport::TestCase
   def test_delete_not_destroy_on_cpk
     tariff = Tariff.where(tariff_id: 2).first
     tariff.delete
-    assert !tariff.persisted?
+    refute(tariff.persisted?)
   end
 
   def test_delete_not_destroy_on_non_cpk
-    article = Article.first
+    article = articles(:third)
     article.delete
-    assert !article.persisted?
+    refute(article.persisted?)
   end
 
   def test_destroy_has_many_delete_all

data/test/test_exists.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestExists < ActiveSupport::TestCase
-  fixtures :articles, :departments, :capitols
+  fixtures :articles, :capitols, :departments, :dorms
   
   def test_id
-    assert(Article.exists?(1))
-    assert(!Article.exists?(-1))
+    assert(Dorm.exists?(1))
+    refute(Dorm.exists?(-1))
   end
 
   def test_array
@@ -29,8 +29,8 @@ class TestExists < ActiveSupport::TestCase
   end
 
   def test_cpk_array_condition
-    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
-    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
+    assert(Department.exists?(['id = ? and location_id = ?', 1, 1]))
+    assert(!Department.exists?(['id = ? and location_id = ?', 1, -1]))
   end
 
   def test_cpk_array_string_id

data/test/test_find.rb

@@ -59,7 +59,7 @@ class TestFind < ActiveSupport::TestCase
   end
 
   def test_find_each_with_scope
-    scoped_departments = Department.where("department_id <> 3")
+    scoped_departments = Department.where("id <> 3")
     scoped_departments.find_each(:batch_size => 2) do |department|
       assert department.id != 3
     end
@@ -74,9 +74,21 @@ class TestFind < ActiveSupport::TestCase
     assert_equal(with_quoted_identifiers(expected), error.message)
   end
 
+  def test_find_with_invalid_ids
+    assert_raise(::ActiveRecord::RecordNotFound) do
+      Suburb.find([-1, -1])
+    end
+  end
+
+  def test_find_with_no_ids
+    assert_raise(::ActiveRecord::RecordNotFound) do
+      Suburb.find
+    end
+  end
+
   def test_find_last_suburb
     suburb = Suburb.last
-    assert_equal([2,1], suburb.id)
+    assert_equal([2,2], suburb.id)
   end
 
   def test_find_last_suburb_with_order
@@ -91,6 +103,13 @@ class TestFind < ActiveSupport::TestCase
     end
   end
 
+  def test_in_batches_enumerator
+    enumerator = Department.in_batches
+    enumerator.each do |batch|
+      assert_equal(Department.count, batch.size)
+    end
+  end
+
   def test_in_batches_of_1
     num_found = 0
     Department.in_batches(of: 1) do |batch|

data/test/test_habtm.rb

@@ -133,9 +133,9 @@ class TestHabtm < ActiveSupport::TestCase
 
     # reload to force reload of associations
     product_one = Product.find(1)
-    assert_equal 2, product_one.restaurants.size
+    assert_equal(2, product_one.restaurants.size)
 
     product_three = Product.find(3)
-    assert_equal 0, product_three.restaurants.size
+    assert_equal(0, product_three.restaurants.size)
   end
 end

data/test/test_ids.rb

@@ -4,7 +4,7 @@ class ChildCpkTest < ReferenceCode
 end
 
 class TestIds < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :pk_called_ids
+  fixtures :reference_types, :reference_codes
   
   CLASSES = {
     :single => {
@@ -18,11 +18,7 @@ class TestIds < ActiveSupport::TestCase
     :dual_strs   => {
       :class => ReferenceCode,
       :primary_keys => ['reference_type_id', 'reference_code'],
-    },
-    :pk_called_id => {
-      :class => PkCalledId,
-      :primary_keys => ['id', 'reference_code'],
-    },
+    }
   }
 
   def setup

data/test/test_nested_attributes.rb

@@ -64,61 +64,4 @@ class TestNestedAttributes < ActiveSupport::TestCase
     assert_equal(reference_code.code_label, 'XX')
     assert_equal(reference_code.abbreviation, 'Xx')
   end
-
-  fixtures :topics, :topic_sources
-
-  def test_nested_attributes_create_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update :topic_sources_attributes => [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update :topic_sources_attributes => [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-
-    topic_source = TopicSource.find_by_platform(platform)
-    cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
-    topic.update :topic_sources_attributes => [{
-      :id => cpk,
-      :keywords => 'jazz'
-    }]
-
-    topic_source = TopicSource.find_by_platform(platform)
-    assert_kind_of(TopicSource, topic_source)
-    assert_equal(topic_source.keywords, 'jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_2
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update(:topic_sources_attributes => [{:id => topic_source.id,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_3
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update(:topic_sources_attributes => [{:id => topic_source.id.to_s,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  end
 end

data/test/test_polymorphic.rb

@@ -1,27 +1,43 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPolymorphic < ActiveSupport::TestCase
-  fixtures :users, :employees, :comments, :hacks, :articles, :readings
+  fixtures :articles, :departments, :employees, :users, :comments
 
-  def test_polymorphic_has_many
-    comments = Hack.find(7).comments
-    assert_equal 7, comments[0].person_id
+  def test_has_many
+    user = users(:santiago)
+    comments = user.comments
+    assert_equal(user.id, comments[0].person_id)
   end
 
-  def test_polymorphic_has_one
-    first_comment = Hack.find(7).first_comment
-    assert_equal 7, first_comment.person_id
+  def test_has_one
+    user = users(:santiago)
+    first_comment = user.first_comment
+    assert_equal(user.id, first_comment.person_id)
   end
 
   def test_has_many_through
-    assert_equal(2, Article.count, 'Baseline sanity check')
-    user = users(:santiago)
-    article_names = user.articles.collect { |a| a.name }.sort
-    assert_equal ['Article One', 'Article Two'], article_names
+    department = departments(:accounting)
+    comment = comments(:employee_comment)
+
+    assert_equal(1, department.comments.size)
+    assert_equal(comment, department.comments[0])
   end
 
-  def test_polymorphic_has_many_through
+  def test_has_many_through_2
+    article = articles(:second)
+
     user = users(:santiago)
-    assert_equal(['andrew'], user.hacks.collect { |a| a.name }.sort)
+    assert_equal(user, article.user_commentators[0])
+
+    user = users(:drnic)
+    assert_equal(user, article.user_commentators[1])
+  end
+
+  def test_clear_has_many_through
+    article = articles(:second)
+
+    assert_equal(2, article.comments.size)
+    article.user_commentators = []
+    assert_equal(0, article.comments.size)
   end
 end

data/test/test_preload.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPreload < ActiveSupport::TestCase
-  fixtures :comments, :users, :employees, :groups, :hacks, :readings
+  fixtures :articles, :comments, :users, :employees, :groups, :readings
 
   class UserForPreload < User
     has_many :comments_with_include_condition, -> { where('person_type = ?', 'User')},
@@ -31,10 +31,11 @@ class TestPreload < ActiveSupport::TestCase
 
   def test_preload_for_conditioned_has_many_association
     # has one comment
+    article = articles(:first)
     user1 = users(:santiago)
     user2 = UserForPreload.create(name: 'TestPreload')
-    Comment.create(person: user2, person_type: 'User')
-    Comment.create(person: user2, person_type: 'User')
+    Comment.create(article: article, person: user2, person_type: 'User')
+    Comment.create(article: article, person: user2, person_type: 'User')
 
     users = UserForPreload.where(id: [user1.id, user2.id]).all
     assert_equal(1, users.first.comments_with_include_condition.size)

data/test/test_serialize.rb

@@ -5,11 +5,11 @@ class TestSerialization < ActiveSupport::TestCase
 
   def test_json
     department = Department.first
-    assert_equal('{"department_id":1,"location_id":1}', department.to_json)
+    assert_equal('{"id":1,"location_id":1}', department.to_json)
   end
 
   def test_serializable_hash
     department = Department.first
-    assert_equal({"department_id" => 1,"location_id" => 1}, department.serializable_hash)
+    assert_equal({"id" => 1,"location_id" => 1}, department.serializable_hash)
   end
 end

data/test/test_update.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestUpdate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
+  fixtures :departments, :reference_types, :reference_codes, :rooms, :room_assignments
 
   CLASSES = {
     :single => {
@@ -36,6 +36,13 @@ class TestUpdate < ActiveSupport::TestCase
     end
   end
 
+  def test_update_attributes_with_id_field
+    department = departments(:accounting)
+    department.update_attribute(:location_id, 3)
+    department.reload
+    assert_equal(3, department.location_id)
+  end
+
   def test_update_primary_key
     obj = ReferenceCode.find([1,1])
     obj.reference_type_id = 2
@@ -76,4 +83,15 @@ class TestUpdate < ActiveSupport::TestCase
 
     assert_equal(2, query.count)
   end
+
+  def test_update_with_uniqueness
+    assignment = room_assignments(:jacksons_room)
+    room_1 = rooms(:branner_room_1)
+    room_2 = rooms(:branner_room_3)
+
+    assert_equal(room_1, assignment.room)
+    assignment.room = room_2
+    assignment.save!
+    assert_equal(room_2, assignment.room)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.0.7
 platform: ruby
 authors:
 - Charlie Savage
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,6 +48,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/active_model/attribute_assignment.rb
 - lib/composite_primary_keys/arel/sqlserver.rb
 - lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
@@ -70,6 +71,7 @@ files:
 - lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
+- lib/composite_primary_keys/connection_adapters/mysql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb
 - lib/composite_primary_keys/core.rb
@@ -126,14 +128,10 @@ files:
 - test/fixtures/employees.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
-- test/fixtures/hack.rb
-- test/fixtures/hacks.yml
 - test/fixtures/membership.rb
 - 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
@@ -141,8 +139,6 @@ files:
 - test/fixtures/reading.rb
 - test/fixtures/readings.yml
 - test/fixtures/reference_code.rb
-- test/fixtures/reference_code_using_composite_key_alias.rb
-- test/fixtures/reference_code_using_simple_key_alias.rb
 - test/fixtures/reference_codes.yml
 - test/fixtures/reference_type.rb
 - test/fixtures/reference_types.yml
@@ -158,8 +154,6 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
-- test/fixtures/seat.rb
-- test/fixtures/seats.yml
 - test/fixtures/street.rb
 - test/fixtures/streets.yml
 - test/fixtures/student.rb
@@ -168,15 +162,12 @@ files:
 - test/fixtures/suburbs.yml
 - test/fixtures/tariff.rb
 - test/fixtures/tariffs.yml
-- test/fixtures/topic.rb
-- test/fixtures/topic_source.rb
 - test/fixtures/topic_sources.yml
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
-- test/test_aliases.rb
 - test/test_associations.rb
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
@@ -188,7 +179,6 @@ files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -203,7 +193,6 @@ files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb
@@ -212,7 +201,7 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,17 +216,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.8
+signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
-- test/abstract_unit.rb
 - test/README_tests.rdoc
-- test/test_aliases.rb
+- test/abstract_unit.rb
 - test/test_associations.rb
-- test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_attributes.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb
@@ -246,7 +234,6 @@ test_files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -261,7 +248,6 @@ test_files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb