composite_primary_keys 12.0.2 → 12.0.7

data/test/fixtures/db_definitions/oracle.sql

@@ -1,17 +1,3 @@
-create sequence topics_seq start with 1000;
-
-create table topics (
-    id          number(11)  primary key,
-    name        varchar(50) default null,  
-    feed_size   number(11)  default null
-);
-
-create table topic_sources (
-    topic_id number(11),
-    platform varchar(50),
-    keywords varchar(50) default null
-);
-
 create sequence reference_types_seq start with 1000;
 
 create table reference_types (
@@ -52,9 +38,11 @@ create table product_tariffs (
     constraint product_tariffs_pk primary key (product_id, tariff_id, tariff_start_date)
 );
 
+create sequence suburbs_city_id_seq start with 1000;
+
 create table suburbs (
-    city_id   number(11),
-    suburb_id number(11),
+    city_id   number(11) default suburbs_city_id_seq.nextval not null,
+    suburb_id number(11) not null,
     name      varchar(50) not null,
     constraint suburbs_pk primary key (city_id, suburb_id)
 );
@@ -113,10 +101,12 @@ create table membership_statuses (
     status   varchar(50) not null
 );
 
+create sequence departments_seq start with 1000;
+
 create table departments (
-    department_id number(11) not null,
+    id number(11) not null,
     location_id   number(11) not null,
-    constraint departments_pk primary key (department_id, location_id)
+    constraint departments_pk primary key (id, location_id)
 );
 
 create sequence employees_seq start with 1000;
@@ -132,17 +122,9 @@ create sequence comments_seq start with 1000;
 
 create table comments (
     id          number(11)   not null primary key,
-    person_id   number(11)   default null,
-    shown       number(11)   default null,
-    person_type varchar(100) default null,
-    hack_id     number(11)   default null
-);
-
-create sequence hacks_seq start with 1000;
-
-create table hacks (
-    id   number(11)  not null primary key,
-    name varchar(50) not null
+    article_id  number(11)   not null,
+    person_id   number(11)   not null,
+    person_type varchar(100) not null
 );
 
 create table restaurants (
@@ -200,13 +182,6 @@ create table room_assignments (
     room_id    number(11) not null
 );
 
-create table seats (
-    flight_number int not null,
-    seat          int not null,
-    customer      int,
-    primary key (flight_number, seat)
-);
-
 create table capitols (
     country varchar(100) not null,
     city varchar(100) not null,
@@ -222,15 +197,4 @@ create table products_restaurants (
 create table employees_groups (
   employee_id int not null,
   group_id int not null
-);
-
-create sequence pk_called_ids_seq start with 1000;
-
-create table pk_called_ids (
-    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,
-    constraint pk_called_ids_pk primary key (id, reference_code)
-);
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,17 +1,3 @@
-create table topics (
-    id          serial not null,
-    name        varchar(50) default null,  
-    feed_size   int default null, 
-    primary key (id)
-);
-
-create table topic_sources (
-    topic_id int         not null,
-    platform varchar(50) not null,
-    keywords varchar(50) default null,
-    primary key (topic_id,platform)
-);
-
 create table reference_types (
     reference_type_id serial not null,
     type_label        varchar(50) default null,
@@ -109,9 +95,9 @@ create table membership_statuses (
 );
 
 create table departments (
-    department_id int not null,
-    location_id   int not null,
-    primary key (department_id, location_id)
+    id serial not null,
+    location_id int not null,
+    primary key (id, location_id)
 );
 
 create table employees (
@@ -124,16 +110,9 @@ create table employees (
 
 create table comments (
     id          serial not null,
-    person_id   int          default null,
-    shown       int          default null,
-    person_type varchar(100) default null,
-    hack_id     int          default null,
-    primary key (id)
-);
-
-create table hacks (
-    id serial not null,
-    name varchar(50) not null,
+    article_id  int not null references articles (id),
+    person_id   int not null,
+    person_type varchar(100) not null,
     primary key (id)
 );
 
@@ -186,13 +165,6 @@ create table room_assignments (
     room_id    int not null
 );
 
-create table seats (
-  flight_number int not null,
-  seat          int not null,
-  customer      int,
-  primary key (flight_number, seat)
-);
-
 create table capitols (
   country text not null,
   city text not null,
@@ -208,13 +180,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 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/db_definitions/sqlite.sql

@@ -1,17 +1,3 @@
-create table topics (
-    id int not null,  
-    name varchar(50) default null,  
-    feed_size int default null, 
-    primary key (id)
-);
-
-create table topic_sources (
-    topic_id int not null,
-    platform varchar(50) not null,
-    keywords varchar(50) default null,
-    primary key (topic_id,platform)
-);
-
 create table reference_types (
     reference_type_id integer primary key,
     type_label varchar(50) default null,
@@ -101,9 +87,9 @@ create table membership_statuses (
 );
 
 create table departments (
-    department_id integer not null,
+    id integer not null,
     location_id integer not null,
-    primary key (department_id, location_id)
+    primary key (id, location_id)
 );
 
 create table employees (
@@ -115,15 +101,9 @@ create table employees (
 
 create table comments (
     id integer not null primary key autoincrement,
-    person_id int null,
-    shown int null,
-    person_type varchar(100) null,
-    hack_id int null
-);
-
-create table hacks (
-    id integer not null primary key autoincrement,
-    name varchar(50) not null
+    article_id int not null,
+    person_id int not null,
+    person_type varchar(100) not null
 );
 
 create table restaurants (
@@ -172,13 +152,6 @@ create table room_assignments (
 	room_id integer not null	
 );
 
-create table seats (
-  flight_number integer not_null,
-  seat integer not_null,
-  customer integer,
-  primary key (flight_number, seat)
-);
-
 create table capitols (
   country text not null,
   city text not null,
@@ -194,13 +167,4 @@ create table products_restaurants (
 create table employees_groups (
   employee_id integer not null,
   group_id integer not null
-);
-
-create table pk_called_ids (
-    id integer 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/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