Fix merge conflicts

admin/future_grants/V1.6.0__remove_erroneous_grant.sql

@@ -0,0 +1,60 @@
+-- These future grants were either given to the incorrect role
+-- or were granted on object types which don't yet exist within
+-- the respective schema.
+
+-- Task ownership ought to be given to the proxy admin role.
+REVOKE OWNERSHIP
+	ON FUTURE TASKS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE.SYNAPSE_ALL_ADMIN;
+REVOKE OWNERSHIP
+	ON FUTURE TASKS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE.SYNAPSE_RAW
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE.SYNAPSE_RAW_ALL_ADMIN;
+REVOKE OWNERSHIP
+	ON FUTURE TASKS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_RAW
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_RAW_ALL_ADMIN;
+-- Previous point, plus there are no tasks in this schema.
+REVOKE OWNERSHIP
+	ON FUTURE TASKS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_ALL_ADMIN;
+
+-- Dynamic table ownership ought to be given to the proxy admin role.
+REVOKE OWNERSHIP
+	ON FUTURE DYNAMIC TABLES
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE.SYNAPSE_ALL_ADMIN;
+REVOKE OWNERSHIP
+	ON FUTURE DYNAMIC TABLES
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_ALL_ADMIN;
+
+-- There aren't yet any of these objects types in these schemata,
+-- so we shouldn't yet configure future grants for these object types.
+REVOKE OWNERSHIP
+	ON FUTURE VIEWS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE.SYNAPSE_RAW
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE.SYNAPSE_RAW_ALL_ADMIN;
+REVOKE OWNERSHIP
+	ON FUTURE VIEWS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_ALL_ADMIN;
+REVOKE OWNERSHIP
+	ON FUTURE STAGES 
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_ALL_ADMIN;
+REVOKE READ, USAGE
+	ON FUTURE STAGES
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_STAGE_READ;
+REVOKE MONITOR
+	ON FUTURE TASKS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_TASK_READ;
+REVOKE SELECT, REFERENCES
+	ON FUTURE VIEWS
+	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
+	FROM DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_VIEW_READ;
+

admin/grants.sql

@@ -598,18 +598,6 @@ GRANT SELECT, MONITOR
 	ON ALL DYNAMIC TABLES
 	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
 	TO DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_TABLE_READ;
-GRANT USAGE, READ
-	ON ALL STAGES
-	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
-	TO DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_STAGE_READ;
-GRANT SELECT, REFERENCES
-	ON ALL VIEWS
-	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
-	TO DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_VIEW_READ;
-GRANT MONITOR
-	ON ALL TASKS
-	IN SCHEMA SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE
-	TO DATABASE ROLE SYNAPSE_DATA_WAREHOUSE_DEV.SYNAPSE_TASK_READ;
 
 -- SYNAPSE_RAW
 GRANT SELECT, REFERENCES