composite_primary_keys 1.0.8 → 1.0.10

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -33,4 +33,7 @@ drop sequence dorms_seq;
 drop table rooms;
 drop table room_attributes;
 drop sequence room_attributes_seq;
-drop table room_attribute_assignments;
+drop table room_attribute_assignments;
+drop table room_assignments;
+drop table students;
+drop sequence students_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -1,190 +1,188 @@
+create sequence reference_types_seq start with 1000;
+
 create table reference_types (
-  reference_type_id  number(11)    primary key,
-  type_label         varchar2(50)  default null,
-  abbreviation       varchar2(50)  default null,
-  description        varchar2(50)  default null
+    reference_type_id number(11)   primary key,
+    type_label        varchar2(50) default null,
+    abbreviation      varchar2(50) default null,
+    description       varchar2(50) default null
 );
 
-create sequence reference_types_seq
-  start with 1000;
-
 create table reference_codes (
-  reference_type_id  number(11),
-  reference_code     number(11),
-  code_label         varchar2(50)  default null,
-  abbreviation       varchar2(50)  default null,
-  description        varchar2(50)  default null,
-  constraint reference_codes_pk primary key(reference_type_id, reference_code)
+    reference_type_id number(11),
+    reference_code    number(11),
+    code_label        varchar2(50) default null,
+    abbreviation      varchar2(50) default null,
+    description       varchar2(50) default null
 );
 
+create sequence products_seq start with 1000;
+
 create table products (
-  id    number(11)    primary key,
-  name  varchar2(50)  default null
+    id   number(11)   primary key,
+    name varchar2(50) default null
 );
 
-create sequence products_seq
-  start with 1000;
-
 create table tariffs (
-  tariff_id   number(11),
-  start_date  date,
-  amount      number(11)  default null,
-  constraint tariffs_pk primary key(tariff_id, start_date)  
+    tariff_id  number(11),
+    start_date date,
+    amount     number(11) default null,
+    constraint tariffs_pk primary key (tariff_id, start_date)
 );
 
 create table product_tariffs (
-  product_id         number(11),
-  tariff_id          number(11),
-  tariff_start_date  date,
-  constraint product_tariffs_pk primary key(product_id, tariff_id, tariff_start_date)
+    product_id        number(11),
+    tariff_id         number(11),
+    tariff_start_date date,
+    constraint product_tariffs_pk primary key (product_id, tariff_id, tariff_start_date)
 );
 
 create table suburbs (
-  city_id    number(11),
-  suburb_id  number(11),
-  name       varchar2(50)  not null,
-  constraint suburbs_pk primary key(city_id, suburb_id)
+    city_id   number(11),
+    suburb_id number(11),
+    name      varchar2(50) not null,
+    constraint suburbs_pk primary key (city_id, suburb_id)
 );
 
+create sequence streets_seq start with 1000;
+
 create table streets (
-  id         number(11)    primary key,
-  city_id    number(11)    not null,
-  suburb_id  number(11)    not null,
-  name       varchar2(50)  not null
+    id        number(11)   primary key,
+    city_id   number(11)   not null,
+    suburb_id number(11)   not null,
+    name      varchar2(50) not null
 );
 
-create sequence streets_seq
-  start with 1000;
+create sequence users_seq start with 1000;
 
 create table users (
-  id    number(11)    primary key,
-  name  varchar2(50)  not null
+    id   number(11)   primary key,
+    name varchar2(50) not null
 );
 
-create sequence users_seq
-  start with 1000;
+create sequence articles_seq start with 1000;
 
 create table articles (
-  id    number(11)    primary key,
-  name  varchar2(50)  not null
+    id   number(11)   primary key,
+    name varchar2(50) not null
 );
 
-create sequence articles_seq
-  start with 1000;
-
+create sequence readings_seq start with 1000;
 
 create table readings (
-  id          number(11)  primary key,
-  user_id     number(11)  not null,
-  article_id  number(11)  not null,
-  rating      number(11)  not null
+    id         number(11) primary key,
+    user_id    number(11) not null,
+    article_id number(11) not null,
+    rating     number(11) not null
 );
 
-create sequence readings_seq
-  start with 1000;
-
+create sequence groups_seq start with 1000;
 
 create table groups (
-  id    number(11)    primary key,
-  name  varchar2(50)  not null
+    id   number(11)   primary key,
+    name varchar2(50) not null
 );
 
-create sequence groups_seq
-  start with 1000;
-
-
 create table memberships (
-  user_id   number(11)  not null,
-  group_id  number(11)  not null,
-  constraint memberships_pk primary key(user_id, group_id)
+    user_id  number(11) not null,
+    group_id number(11) not null,
+    constraint memberships_pk primary key (user_id, group_id)
 );
 
+create sequence membership_statuses_seq start with 1000;
+
 create table membership_statuses (
-  id        number(11)    primary key,
-  user_id   number(11)    not null,
-  group_id  number(11)    not null,
-  status    varchar2(50)  not null
+    id       number(11)   primary key,
+    user_id  number(11)   not null,
+    group_id number(11)   not null,
+    status   varchar2(50) not null
 );
 
-create sequence membership_statuses_seq
-  start with 1000;
-
-CREATE TABLE departments (
-  department_id number(11) NOT NULL,
-  location_id number(11) NOT NULL,
-  constraint departments_pk primary key(department_id, location_id)
+create table departments (
+    department_id number(11) not null,
+    location_id   number(11) not null,
+    constraint departments_pk primary key (department_id, location_id)
 );
 
-CREATE TABLE employees (
- id number(11) NOT NULL primary key,
- department_id number(11) DEFAULT NULL,
- location_id number(11) DEFAULT NULL 
+create sequence employees_seq start with 1000;
+
+create table employees (
+    id            number(11) not null primary key,
+    department_id number(11) default null,
+    location_id   number(11) default null
 );
 
-create sequence employees_seq
-  start with 1000;
+create sequence comments_seq start with 1000;
 
-CREATE TABLE comments (
-	id number(11) NOT NULL PRIMARY KEY,
-	person_id varchar(100) DEFAULT NULL,
-	person_type varchar(100) DEFAULT NULL,
-	hack_id varchar(100) DEFAULT NULL
+create table comments (
+    id          number(11)   not null primary key,
+    person_id   varchar(100) default null,
+    person_type varchar(100) default null,
+    hack_id     varchar(100) default null
 );
 
-create sequence comments_seq
-  start with 1000;
-
-CREATE TABLE hacks (
- name varchar(50) NOT NULL PRIMARY KEY
+create table hacks (
+    name varchar(50) not null primary key
 );
 
 create table kitchen_sinks (
-	id_1 number(11) not null,
-	id_2 number(11) not null,
-	a_date date,
-	a_string varchar(100),
-	constraint kitchen_sinks_pk primary key(id_1, id_2)
+    id_1   number(11) not null,
+    id_2   number(11) not null,
+    a_date date,
+    a_string varchar(100),
+    constraint kitchen_sinks_pk primary key (id_1, id_2)
 );
 
 create table restaurants (
-	franchise_id number(11) not null,
-	store_id number(11) not null,
-	name varchar(100),
-	constraint restaurants_pk primary key (franchise_id, store_id)
+    franchise_id number(11) not null,
+    store_id     number(11) not null,
+    name         varchar(100),
+    constraint restaurants_pk primary key (franchise_id, store_id)
 );
 
 create table restaurants_suburbs (
-	franchise_id number(11) not null,
-	store_id number(11) not null,
-	city_id number(11) not null,
-	suburb_id number(11) not null
+    franchise_id number(11) not null,
+    store_id     number(11) not null,
+    city_id      number(11) not null,
+    suburb_id    number(11) not null
 );
 
+create sequence dorms_seq start with 1000;
+
 create table dorms (
-	id number(11) not null,
-	constraint dorms_pk primary key (id)
+    id number(11) not null,
+    constraint dorms_pk primary key (id)
 );
 
-create sequence dorms_seq
-  start with 1000;
-
 create table rooms (
-	dorm_id number(11) not null,
-	room_id number(11) not null,
-	constraint rooms_pk primary key (dorm_id, room_id)
+    dorm_id number(11) not null,
+    room_id number(11) not null,
+    constraint rooms_pk primary key (dorm_id, room_id)
 );
 
+create sequence room_attributes_seq start with 1000;
+
 create table room_attributes (
-	id number(11) not null,
-	name varchar(50),
-	constraint room_attributes_pk primary key (id)
+    id   number(11) not null,
+    name varchar(50),
+    constraint room_attributes_pk primary key (id)
 );
 
-create sequence room_attributes_seq
-  start with 1000;
-
 create table room_attribute_assignments (
-	dorm_id number(11) not null,
-	room_id number(11) not null,
-	room_attribute_id number(11) not null
-);
+    dorm_id           number(11) not null,
+    room_id           number(11) not null,
+    room_attribute_id number(11) not null
+);
+
+create sequence students_seq start with 1000;
+
+create table students (
+    id number(11) not null,
+    constraint students_pk primary key (id)
+);
+
+create table room_assignments (
+    student_id number(11) not null,
+    dorm_id    number(11) not null,
+    room_id    number(11) not null
+);
+

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,133 +1,199 @@
-CREATE SEQUENCE public.reference_types_seq START 100;
-CREATE TABLE reference_types (
-  reference_type_id int DEFAULT nextval('public.reference_types_seq'),
-  type_label varchar(50) default NULL,
-  abbreviation varchar(50) default NULL,
-  description varchar(50) default NULL,
-  PRIMARY KEY  (reference_type_id)
+create sequence public.reference_types_seq start 1000;
+
+create table reference_types (
+    reference_type_id int         default nextval('public.reference_types_seq'),
+    type_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null,
+    primary key (reference_type_id)
 );
 
-CREATE TABLE reference_codes (
-  reference_type_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,
-  PRIMARY KEY  (reference_type_id,reference_code)
+create table reference_codes (
+    reference_type_id int,
+    reference_code    int         not null,
+    code_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null
 );
 
-CREATE SEQUENCE public.products_seq START 100;
-CREATE TABLE products (
-  id int NOT NULL DEFAULT nextval('public.products_seq'),
-  name varchar(50) default NULL,
-  PRIMARY KEY  (id)
+create sequence public.products_seq start 1000;
+
+create table products (
+    id   int         not null default nextval('public.products_seq'),
+    name varchar(50) default null,
+    primary key (id)
 );
 
-CREATE TABLE tariffs (
-  tariff_id int NOT NULL,
-  start_date date NOT NULL,
-  amount int default NULL,
-  PRIMARY KEY  (tariff_id,start_date)
+create table tariffs (
+    tariff_id  int  not null,
+    start_date date not null,
+    amount     int  default null,
+    primary key (tariff_id, start_date)
 );
 
-CREATE TABLE product_tariffs (
-  product_id int NOT NULL,
-  tariff_id int NOT NULL,
-  tariff_start_date date NOT NULL,
-  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
+create table product_tariffs (
+    product_id        int  not null,
+    tariff_id         int  not null,
+    tariff_start_date date not null,
+    primary key (product_id, tariff_id, tariff_start_date)
 );
 
-CREATE TABLE suburbs (
-  city_id int NOT NULL,
-  suburb_id int NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (city_id,suburb_id)
+create table suburbs (
+    city_id   int         not null,
+    suburb_id int         not null,
+    name      varchar(50) not null,
+    primary key (city_id, suburb_id)
 );
 
-CREATE SEQUENCE public.streets_seq START 100;
-CREATE TABLE streets (
-  id int NOT NULL DEFAULT nextval('public.streets_seq'),
-  city_id int NOT NULL,
-  suburb_id int NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
+create sequence public.streets_seq start 1000;
+
+create table streets (
+    id        int         not null default nextval('public.streets_seq'),
+    city_id   int         not null,
+    suburb_id int         not null,
+    name      varchar(50) not null,
+    primary key (id)
 );
 
-CREATE SEQUENCE public.users_seq START 100;
-CREATE TABLE users (
-  id int NOT NULL DEFAULT nextval('public.users_seq'),
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
+create sequence public.users_seq start 1000;
+
+create table users (
+    id   int         not null default nextval('public.users_seq'),
+    name varchar(50) not null,
+    primary key (id)
 );
 
-CREATE SEQUENCE public.articles_seq START 100;
-CREATE TABLE articles (
-  id int NOT NULL DEFAULT nextval('public.articles_seq'),
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
+create sequence public.articles_seq start 1000;
+
+create table articles (
+    id   int         not null default nextval('public.articles_seq'),
+    name varchar(50) not null,
+    primary key (id)
 );
 
-CREATE SEQUENCE public.readings_seq START 100;
-CREATE TABLE readings (
-  id int NOT NULL DEFAULT nextval('public.readings_seq'),
-  user_id int NOT NULL,
-  article_id int NOT NULL,
-  rating int NOT NULL,
-  PRIMARY KEY  (id)
+create sequence public.readings_seq start 1000;
+
+create table readings (
+    id         int not null default nextval('public.readings_seq'),
+    user_id    int not null,
+    article_id int not null,
+    rating     int not null,
+    primary key (id)
 );
 
-CREATE SEQUENCE public.groups_seq START 100;
-CREATE TABLE groups (
-  id int NOT NULL DEFAULT nextval('public.groups_seq'),
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
+create sequence public.groups_seq start 1000;
+
+create table groups (
+    id   int         not null default nextval('public.groups_seq'),
+    name varchar(50) not null,
+    primary key (id)
 );
 
-CREATE TABLE memberships (
-  user_id int NOT NULL,
-  group_id int NOT NULL,
-  PRIMARY KEY  (user_id,group_id)
+create table memberships (
+    user_id  int not null,
+    group_id int not null,
+    primary key (user_id, group_id)
 );
 
-CREATE SEQUENCE public.membership_statuses_seq START 100;
-CREATE TABLE membership_statuses (
-  id int NOT NULL DEFAULT nextval('public.membership_statuses_seq'),
-  user_id int NOT NULL,
-  group_id int NOT NULL,
-	status varchar(50) NOT NULL,
-  PRIMARY KEY (id)
+create sequence public.membership_statuses_seq start 1000;
+
+create table membership_statuses (
+    id       int         not null default nextval('public.membership_statuses_seq'),
+    user_id  int         not null,
+    group_id int         not null,
+    status   varchar(50) not null,
+    primary key (id)
 );
 
-CREATE TABLE departments (
-  department_id int NOT NULL,
-  location_id int NOT NULL,
-  PRIMARY KEY (department_id, location_id)
+create table departments (
+    department_id int not null,
+    location_id   int not null,
+    primary key (department_id, location_id)
 );
 
-CREATE TABLE employees (
- id int NOT NULL,
- department_id int DEFAULT NULL,
- location_id int DEFAULT NULL,
- PRIMARY KEY (id)
+create sequence public.employees_seq start 1000;
+
+create table employees (
+    id            int not null default nextval('public.employees_seq'),
+    department_id int default null,
+    location_id   int default null,
+    primary key (id)
 );
 
-CREATE TABLE comments (
-	id int NOT NULL,
-	person_id varchar(100) DEFAULT NULL,
-	person_type varchar(100) DEFAULT NULL,
-	hack_id varchar(100) DEFAULT NULL,
-	PRIMARY KEY (id)
+create sequence public.comments_seq start 1000;
+
+create table comments (
+    id          int          not null default nextval('public.comments_seq'),
+    person_id   varchar(100) default null,
+    person_type varchar(100) default null,
+    hack_id     varchar(100) default null,
+    primary key (id)
 );
 
-CREATE TABLE hacks (
- name varchar(50) NOT NULL,
- PRIMARY KEY (name)
+create table hacks (
+    name varchar(50) not null,
+    primary key (name)
 );
 
 create table kitchen_sinks (
-	id_1 int not null,
-	id_2 int not null,
-	a_date date,
-	a_string varchar(100),
-	primary key (id_1, id_2)
-);
+    id_1   int not null,
+    id_2   int not null,
+    a_date date,
+    a_string varchar(100),
+    primary key (id_1, id_2)
+);
+
+create table restaurants (
+    franchise_id int not null,
+    store_id     int not null,
+    name         varchar(100),
+    primary key (franchise_id, store_id)
+);
+
+create table restaurants_suburbs (
+    franchise_id int not null,
+    store_id     int not null,
+    city_id      int not null,
+    suburb_id    int not null
+);
+
+create sequence public.dorms_seq start 1000;
+
+create table dorms (
+    id int not null default nextval('public.dorms_seq'),
+    primary key (id)
+);
+
+create table rooms (
+    dorm_id int not null,
+    room_id int not null,
+    primary key (dorm_id, room_id)
+);
+
+create sequence public.room_attributes_seq start 1000;
+
+create table room_attributes (
+    id   int not null default nextval('public.room_attributes_seq'),
+    name varchar(50),
+    primary key (id)
+);
+
+create table room_attribute_assignments (
+    dorm_id           int not null,
+    room_id           int not null,
+    room_attribute_id int not null
+);
+
+create sequence public.students_seq start 1000;
+
+create table students (
+    id int not null default nextval('public.students_seq'),
+    primary key (id)
+);
+
+create table room_assignments (
+    student_id int not null,
+    dorm_id    int not null,
+    room_id    int not null
+);
+