Merge branch 'master' into hide-jbrowse

Author: Ryan Doherty

Model/data/create_schema_announce_postgres.sql

@@ -3,12 +3,14 @@
  * tables and sequences common to Ebrc websites.
  *============================================================================*/
 
-set role COMM_WDK_W;  -- TODO: remove GRANTs
+reset role;
 
 DROP SCHEMA IF EXISTS announce CASCADE;
 CREATE SCHEMA IF NOT EXISTS announce;
 GRANT USAGE ON SCHEMA announce TO COMM_WDK_W;
 
+set role COMM_WDK_W; 
+
 /*==============================================================================
  * create tables
  *============================================================================*/

Model/data/create_schema_uploads_postgres.sql

@@ -1,8 +1,10 @@
-set role COMM_WDK_W;  -- TODO: remove GRANTs
+reset role;
 
 CREATE SCHEMA IF NOT EXISTS UPLOADS;
 GRANT USAGE ON SCHEMA UPLOADS TO COMM_WDK_W;
 
+set role COMM_WDK_W;
+
 CREATE TABLE UPLOADS.USERFILE (
   USERFILEID BIGINT NOT NULL, 
   FILENAME VARCHAR(255) NOT NULL, 

Model/data/create_schema_wdkuser_postgres.sql

@@ -3,12 +3,15 @@
  * and sequences needed for a properly functioning WDK.
  *============================================================================*/
 
-set role COMM_WDK_W; -- TODO: remove GRANTs
+reset role;
 
 DROP SCHEMA IF EXISTS wdkuser CASCADE;
 CREATE SCHEMA IF NOT EXISTS wdkuser;
 GRANT USAGE ON SCHEMA wdkuser TO COMM_WDK_W;
 
+set role COMM_WDK_W; -- TODO: remove GRANTs
+
+
 /*==============================================================================
  * create tables
  *============================================================================*/