composite_primary_keys 12.0.0 → 12.0.5

data/test/fixtures/user.rb

@@ -1,9 +1,10 @@
 class User < ActiveRecord::Base
   has_many :readings
   has_many :articles, :through => :readings
+
   has_many :comments, :as => :person
-  has_many :hacks, :through => :comments, :source => :hack
-  
+  has_one :first_comment, :as => :person, :class_name => "Comment"
+
   def find_custom_articles
     articles.where("name = ?", "Article One")
   end

data/test/test_associations.rb

@@ -96,18 +96,23 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_one_association_primary_key_and_foreign_key_are_present
-    department = departments(:human_resources)
+    # department = departments(:engineering)
+    # assert_equal(2, department.employees.count)
+    # assert_equal('Sarah', department.employees[0].name)
+    # assert_equal('Robert', department.employees[1].name)
+    # assert_equal('Sarah', department.head.name)
 
+    department = departments(:human_resources)
     assert_equal(1, department.employees.count)
     assert_equal('Mindy', department.employees[0].name)
+    assert_equal('Mindy', department.head.name)
 
     head = department.create_head(name: 'Rick')
-    assert_equal(department.department_id, head.department_id)
-    assert_equal(department.location_id, head.location_id)
+    assert_equal(department, head.department)
+    assert_equal('Rick', department.head.name)
 
     department.reload
     assert_equal(1, department.employees.count)
-    assert_equal('Rick', department.employees[0].name)
   end
 
   def test_has_one_autosave
@@ -139,9 +144,10 @@ class TestAssociations < ActiveSupport::TestCase
 
     department.reload
     assert_equal(3, department.employees.count)
-    assert_equal('Steve', department.employees[0].name)
-    assert_equal('Jill', department.employees[1].name)
-    assert_equal('Rick', department.employees[2].name)
+    employees = department.employees.sort_by(&:name)
+    assert_equal('Jill', employees[0].name)
+    assert_equal('Rick', employees[1].name)
+    assert_equal('Steve', employees[2].name)
   end
 
   def test_find_includes_product_tariffs_product
@@ -174,6 +180,13 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, tarrifs_length)
   end
 
+  def test_has_many_through_2
+    assert_equal(3, Article.count)
+    user = users(:santiago)
+    article_names = user.articles.map(&:name).sort
+    assert_equal(['Article One', 'Article Two'], article_names)
+  end
+
   def test_new_style_includes_with_conditions
     product_tariff = ProductTariff.includes(:tariff).where('tariffs.amount < 5').references(:tariffs).first
     assert_equal(0, product_tariff.tariff.amount)
@@ -203,16 +216,8 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_associations_with_conditions
-    suburb = Suburb.find([2, 1])
-    assert_equal 2, suburb.streets.size
-
-    suburb = Suburb.find([2, 1])
-    assert_equal 1, suburb.first_streets.size
-
-    suburb = Suburb.includes(:streets).find([2, 1])
+    suburb = Suburb.find([2, 2])
     assert_equal 2, suburb.streets.size
-
-    suburb = Suburb.includes(:first_streets).find([2, 1])
     assert_equal 1, suburb.first_streets.size
   end
 
@@ -239,7 +244,7 @@ class TestAssociations < ActiveSupport::TestCase
     steve = employees(:steve)
     steve.department = departments(:engineering)
     # It was returning this before:
-    #   {"[:department_id, :location_id]"=>[nil, [2, 1]]}
+    #   {"[:id, :location_id]"=>[nil, [2, 1]]}
     assert_equal({"department_id"=>[1, 2]}, steve.changes)
   end
 
@@ -263,12 +268,12 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal user,    reading.user
   end
 
-  def test_has_many_build__composite_key
+  def test_has_many_build_composite_key
     department = departments(:engineering)
     employee = department.employees.build
-    assert_equal department.department_id, employee.department_id
-    assert_equal department.location_id,   employee.location_id
-    assert_equal department,               employee.department
+    assert_equal(department[:id], employee.department_id)
+    assert_equal(department.location_id, employee.location_id)
+    assert_equal(department, employee.department)
   end
 
   def test_has_many_with_primary_key
@@ -331,9 +336,11 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_limitable_reflections
-    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').references(:membership_statuses).limit(1)
-    assert_equal(1, memberships.length)
+    memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').references(:membership_statuses)
+    assert_equal(2, memberships.length)
+
     assert_equal([1,1], memberships[0].id)
+    assert_equal([3,2], memberships[1].id)
   end
 
   def test_foreign_key_present_with_null_association_ids

data/test/test_composite_arrays.rb

@@ -21,4 +21,18 @@ class CompositeArraysTest < ActiveSupport::TestCase
     assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
     assert_equal '1,2,3', keys.to_s
   end
+
+  def test_parse
+    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
+  end
+
+  def test_to_s
+    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
+    assert_equal 'The USA,^5EWashington^2C D.C.',
+                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
+  end
 end

data/test/test_create.rb

@@ -48,16 +48,21 @@ 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_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] = 100
+    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 +170,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)

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

@@ -41,6 +41,14 @@ class TestFind < ActiveSupport::TestCase
     assert_equal(['The Netherlands', 'Amsterdam'], capitol.id)
   end
 
+  def test_find_with_strings_with_comma_as_composite_keys
+    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
+    assert_equal ['The USA', 'Washington, D.C.'], capitol.id
+
+    assert_equal capitol, Capitol.find(['The USA', 'Washington, D.C.'])
+    assert_equal capitol, Capitol.find(capitol.to_param)
+  end
+
   def test_find_each
     room_assignments = []
     RoomAssignment.find_each(:batch_size => 2) do |assignment|
@@ -51,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
@@ -66,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

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
@@ -40,6 +36,9 @@ class TestIds < ActiveSupport::TestCase
     testing_with do
       assert_equal '1,1', @first.to_param if composite?
     end
+
+    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
+    assert_equal 'The USA,Washington^2C D.C.', capitol.to_param
   end
 
   def test_ids_to_s

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)