composite_primary_keys 12.0.2 → 12.0.3

data/lib/composite_primary_keys/relation/predicate_builder/association_query_value.rb

@@ -6,7 +6,7 @@ module ActiveRecord
         if associated_table.association_join_foreign_key.is_a?(Array)
           if ids.is_a?(ActiveRecord::Relation)
             ids.map do |id|
-              id.ids_hash
+              associated_table.association_join_foreign_key.zip(id.id).to_h
             end
           else
             [associated_table.association_join_foreign_key.zip(ids).to_h]

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 12
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/abstract_unit.rb

@@ -1,7 +1,8 @@
-spec_name = ENV['ADAPTER'] || 'sqlite'
-require 'bundler/setup'
+spec_name = ENV['ADAPTER'] || 'mysql'
+require 'bundler'
 require 'minitest/autorun'
 
+Bundler.setup(:default, spec_name.to_sym)
 Bundler.require(:default, spec_name.to_sym)
 require 'composite_primary_keys'
 

data/test/fixtures/article.rb

@@ -2,5 +2,9 @@ class Article < ActiveRecord::Base
   validates :id, uniqueness: true, numericality: true, allow_nil: true, allow_blank: true, on: :create
   has_many :readings, :dependent => :delete_all
   has_many :users, :through => :readings
+
+  has_many :comments, :dependent => :delete_all
+  has_many :employee_commentators, :through => :comments, :source => :person, :source_type => :employee
+  has_many :user_commentators, :through => :comments, :source => :person, :source_type => "User"
 end
 

data/test/fixtures/articles.yml

@@ -1,7 +1,8 @@
 first:
-  id: 1
   name: Article One
   
 second:
-  id: 2
-  name: Article Two
+  name: Article Two
+
+third:
+  name: Article Three

data/test/fixtures/comment.rb

@@ -1,7 +1,5 @@
 class Comment < ActiveRecord::Base
   belongs_to :person, :polymorphic => true
-  belongs_to :hack
-
-  enum :shown => [ :true, :false ]
+  belongs_to :article
 end
 

data/test/fixtures/comments.yml

@@ -1,16 +1,17 @@
-comment1:
+employee_comment:
   id: 1
+  article: first
   person_id: 1
   person_type: Employee
-  
-comment2:
+
+user_comment_1:
   id: 2
+  article: second
   person_id: 1
   person_type: User
-  hack_id: 7
-  
-comment3:
+
+user_comment_2:
   id: 3
-  person_id: 7
-  person_type: Hack
-  
+  article: second
+  person_id: 2
+  person_type: User

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -1,17 +1,3 @@
-CREATE TABLE topics (
-  id integer NOT NULL,  
-  name varchar(50) default NULL,  
-  feed_size integer default NULL, 
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE topic_sources (
-  topic_id integer 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 NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
   type_label varchar(50) default NULL,  

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -14,6 +14,4 @@ drop table PRODUCT_TARIFFS;
 drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
-drop table PRODUCTS_RESTAURANTS;
-drop table TOPICS;
-drop table TOPIC_SOURCES;
+drop table PRODUCTS_RESTAURANTS;

data/test/fixtures/db_definitions/mysql.sql

@@ -1,17 +1,3 @@
-create table topics (
-    id int not null auto_increment,
-    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 int not null auto_increment,
     type_label varchar(50) default null,
@@ -52,7 +38,7 @@ create table product_tariffs (
 );
 
 create table suburbs (
-    city_id int not null,
+    city_id int not null auto_increment,
     suburb_id int not null,
     name varchar(50) not null,
     primary key (city_id, suburb_id)
@@ -107,9 +93,9 @@ create table membership_statuses (
 );
 
 create table departments (
-    department_id int not null,
+    id int not null auto_increment,
     location_id int not null,
-    primary key (department_id, location_id)
+    primary key (id, location_id)
 );
 
 create table employees (
@@ -122,16 +108,9 @@ create table employees (
 
 create table comments (
     id int not null auto_increment,
-    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 int not null auto_increment,
-    name varchar(50) not null,
+    article_id int not null,
+    person_id int not null,
+    person_type varchar(100) not null,
     primary key (id)
 );
 
@@ -184,13 +163,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 varchar(100) not null,
   city varchar(100) not null,
@@ -206,13 +178,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 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/oracle.drop.sql

@@ -1,6 +1,3 @@
-drop table topics;
-drop sequence topics_seq;
-drop table topic_sources;
 drop table reference_types;
 drop sequence reference_types_seq;
 drop table reference_codes;
@@ -9,6 +6,7 @@ drop sequence products_seq;
 drop table tariffs;
 drop table product_tariffs;
 drop table suburbs;
+drop sequence suburbs_city_id_seq;
 drop table streets;
 drop sequence streets_seq;
 drop table users;
@@ -23,12 +21,11 @@ drop table memberships;
 drop table membership_statuses;
 drop sequence membership_statuses_seq;
 drop table departments;
+drop sequence departments_seq;
 drop table employees;
 drop sequence employees_seq;
 drop table comments;
 drop sequence comments_seq;
-drop table hacks;
-drop sequence hacks_seq;
 drop table restaurants;
 drop table restaurants_suburbs;
 drop table dorms;
@@ -40,9 +37,6 @@ drop table room_attribute_assignments;
 drop table room_assignments;
 drop table students;
 drop sequence students_seq;
-drop table seats;
 drop table capitols;
 drop table products_restaurants;
-drop table employees_groups;
-drop table pk_called_ids;
-drop sequence pk_called_ids_seq;
+drop table employees_groups;

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)
-);
+);