From 0db6a2b918630a5cc638aef1644034404384ab91 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 15 Mar 2017 20:15:49 +0000 Subject: [PATCH] #21: Oops! Forgot the organisers Also tidied up the 'add-user-table' migration, which was actually just part of the how-to-get-started-with-migratus stuff and we don't need. --- .../migrations/20161010155448-add-users-table.down.sql | 1 - .../migrations/20161010155448-add-users-table.up.sql | 9 --------- .../migrations/20170315190500-roles-and-teams.down.sql | 2 ++ .../migrations/20170315190500-roles-and-teams.up.sql | 4 ++++ 4 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 resources/migrations/20161010155448-add-users-table.down.sql delete mode 100644 resources/migrations/20161010155448-add-users-table.up.sql diff --git a/resources/migrations/20161010155448-add-users-table.down.sql b/resources/migrations/20161010155448-add-users-table.down.sql deleted file mode 100644 index cc1f647..0000000 --- a/resources/migrations/20161010155448-add-users-table.down.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE users; diff --git a/resources/migrations/20161010155448-add-users-table.up.sql b/resources/migrations/20161010155448-add-users-table.up.sql deleted file mode 100644 index 05ad4af..0000000 --- a/resources/migrations/20161010155448-add-users-table.up.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE users -(id VARCHAR(20) PRIMARY KEY, - first_name VARCHAR(30), - last_name VARCHAR(30), - email VARCHAR(30), - admin BOOLEAN, - last_login TIME, - is_active BOOLEAN, - pass VARCHAR(300)); diff --git a/resources/migrations/20170315190500-roles-and-teams.down.sql b/resources/migrations/20170315190500-roles-and-teams.down.sql index 34e0add..a8bdb6a 100644 --- a/resources/migrations/20170315190500-roles-and-teams.down.sql +++ b/resources/migrations/20170315190500-roles-and-teams.down.sql @@ -1,5 +1,7 @@ drop table teammemberships; +drop table teamorganiserships; + drop index ix_teams_name; drop table teams; diff --git a/resources/migrations/20170315190500-roles-and-teams.up.sql b/resources/migrations/20170315190500-roles-and-teams.up.sql index 7708d4e..7ff7ffc 100644 --- a/resources/migrations/20170315190500-roles-and-teams.up.sql +++ b/resources/migrations/20170315190500-roles-and-teams.up.sql @@ -25,6 +25,10 @@ create table if not exists teammemberships ( canvasser_id integer not null references canvassers(id) ); +create table if not exists teamorganiserships ( + team_id integer not null references teams(id), + canvasser_id integer not null references canvassers(id) +); alter table roles owner to youyesyet;