Merge branch 'master' of bitbucket.org:jamkazam/jam-db

manifest

@@ -9,5 +9,6 @@ invitations.sql
 users_v2.sql
 instruments.sql
 users_v3.sql
+musicians_instruments.sql
 musician_access.sql
 tracks.sql

up/locations.sql

@@ -0,0 +1,11 @@
+-- locations
+CREATE TABLE musicians_instruments (
+    id VARCHAR(64) PRIMARY KEY DEFAULT uuid_generate_v4(),
+    musician_id VARCHAR(64) REFERENCES musicians(id) ON DELETE CASCADE,
+    instrument_id VARCHAR(64) REFERENCES instruments(id) ON DELETE CASCADE,
+    proficiency_level SMALLINT NOT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+ALTER TABLE musicians_instruments ADD CONSTRAINT musician_instrument_uniqkey UNIQUE (musician_id, instrument_id);

up/musicians_instruments.sql

@@ -0,0 +1,3 @@
+ALTER TABLE musicians_instruments ALTER COLUMN user_id SET NOT NULL;
+ALTER TABLE musicians_instruments ALTER COLUMN instrument_id SET NOT NULL;
+ALTER TABLE musicians_instruments ADD COLUMN priority SMALLINT NOT NULL DEFAULT 1;