composite_primary_keys 12.0.2 → 12.0.3

data/test/fixtures/db_definitions/sqlserver.sql

@@ -1,17 +1,5 @@
 USE [composite_primary_keys_unittest];
 
-CREATE TABLE topics (
-    id          [int] IDENTITY(1000,1) NOT NULL,  
-    name        [varchar](50) default NULL,  
-    feed_size   [int] default NULL
-);
-
-CREATE TABLE topic_sources (
-    topic_id    [int] NOT NULL,
-    platform    [varchar](50) NOT NULL,
-    keywords    [varchar](50) default NULL,
-);
-
 CREATE TABLE reference_types (
     reference_type_id [int] IDENTITY(1000,1) NOT NULL,
     type_label        [varchar](50) NULL,
@@ -102,10 +90,10 @@ CREATE TABLE membership_statuses (
 );
 
 CREATE TABLE departments (
-    department_id [int] NOT NULL,
+    id [int] IDENTITY(100,1) NOT NULL,
     location_id   [int] NOT NULL
     CONSTRAINT [departments_pk] PRIMARY KEY
-        ( [department_id], [location_id] )
+        ( [id], [location_id] )
 );
 
 CREATE TABLE employees (
@@ -117,15 +105,9 @@ CREATE TABLE employees (
 
 CREATE TABLE comments (
     id          [int] IDENTITY(1000,1) PRIMARY KEY NOT NULL,
-    person_id   [int] NULL,
-    shown       [int] NULL,
-    person_type varchar(100)      NULL,
-    hack_id     [int] NULL
-);
-
-CREATE TABLE hacks (
-    id   [int]  IDENTITY(1000,1) PRIMARY KEY NOT NULL,
-    name [varchar](50) NOT NULL
+    article_id  [int] NOT NULL,
+    person_id   [int] NOT NULL,
+    person_type varchar(100) NULL
 );
 
 CREATE TABLE restaurants (
@@ -176,14 +158,6 @@ CREATE TABLE room_assignments (
     room_id    [int] NOT NULL
 );
 
-CREATE TABLE seats (
-    flight_number [int] NOT NULL,
-    seat          [int] NOT NULL,
-    customer      [int]
-    CONSTRAINT [seats_pk] PRIMARY KEY
-        ( [flight_number], [seat] )
-);
-
 CREATE TABLE capitols (
     country varchar(450) NOT NULL,
     city varchar(450) NOT NULL
@@ -200,14 +174,4 @@ CREATE TABLE products_restaurants (
 CREATE TABLE employees_groups (
     employee_id [int] not null,
     group_id [int] not null
-);
-
-CREATE TABLE pk_called_ids (
-    id                [int] IDENTITY(1000,1) NOT NULL,
-    reference_code    [int]         not null,
-    code_label        [varchar](50) default null,
-    abbreviation      [varchar](50) default null,
-    description       [varchar](50) default null
-    CONSTRAINT [pk_called_ids_pk] PRIMARY KEY
-        ( [id], [reference_code] )
 );

data/test/fixtures/department.rb

@@ -1,11 +1,16 @@
 class Department < ActiveRecord::Base
-  self.primary_keys = :department_id, :location_id
+  self.primary_keys = :id, :location_id
+
   has_many :employees,
            # We intentionally redefine primary key for test purposes. #455
-           :primary_key =>  [:department_id, :location_id],
+           :primary_key =>  [:id, :location_id],
            :foreign_key => [:department_id, :location_id]
+
+  has_many :comments, :through => :employees
+
   has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
                  # We intentionally redefine primary key for test purposes. #455
-                 :primary_key =>  [:department_id, :location_id],
+                 :primary_key =>  [:id, :location_id],
                  :foreign_key => [:department_id, :location_id]
+
 end

data/test/fixtures/departments.yml

@@ -1,15 +1,15 @@
 accounting:
-  department_id: 1
+  id: 1
   location_id: 1
 
 engineering:
-  department_id: 2
+  id: 2
   location_id: 1
 
 human_resources:
-  department_id: 3
+  id: 3
   location_id: 2
 
 offsite_accounting:
-  department_id: 1
+  id: 1
   location_id: 2

data/test/fixtures/readings.yml

@@ -1,11 +1,11 @@
 santiago_first:
   id: 1
   user_id: 1
-  article_id: 1
+  article: first
   rating: 4
   
 santiago_second:
   id: 2
   user_id: 1
-  article_id: 2
+  article: second
   rating: 5

data/test/fixtures/restaurants_suburbs.yml

@@ -8,4 +8,4 @@ b:
   franchise_id: 1
   store_id: 1
   city_id: 2
-  suburb_id: 1
+  suburb_id: 2

data/test/fixtures/streets.yml

@@ -7,11 +7,11 @@ first:
 second1:
   id: 2
   city_id: 2
-  suburb_id: 1
+  suburb_id: 2
   name: First Street
 
 second2:
   id: 3
   city_id: 2
-  suburb_id: 1
+  suburb_id: 2
   name: Second Street

data/test/fixtures/suburbs.yml

@@ -5,10 +5,10 @@ first:
 
 second:
   city_id: 2
-  suburb_id: 1
+  suburb_id: 2
   name: Second Suburb
 
 no_mcdonalds:
   city_id: 1
-  suburb_id: 2
+  suburb_id: 3
   name: Third Suburb  

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_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

@@ -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
@@ -76,7 +76,7 @@ class TestFind < ActiveSupport::TestCase
 
   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

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