fix(role-grafana): correct variable usage

src/deploy/role_grafana.sql

@@ -9,7 +9,7 @@ BEGIN;
 \set role_grafana_username `cat /run/secrets/postgres_role_grafana_username`
 
 CREATE ROLE :role_grafana_username LOGIN PASSWORD :'role_grafana_password';
-;
+
 GRANT ALL PRIVILEGES ON DATABASE grafana TO :role_grafana_username;
 GRANT ALL ON SCHEMA public TO :role_grafana_username;
 

src/revert/database_grafana.sql

@@ -1,3 +1,3 @@
 -- Revert maevsi:database_grafana from pg
 
-DROP DATABASE grafana;
+DROP DATABASE grafana WITH (FORCE);

src/revert/role_grafana.sql

@@ -4,7 +4,9 @@
 
 BEGIN;
 
-DROP OWNED BY grafana;
-DROP ROLE grafana;
+\set role_grafana_username `cat /run/secrets/postgres_role_grafana_username`
+
+DROP OWNED BY :role_grafana_username;
+DROP ROLE :role_grafana_username;
 
 COMMIT;

src/verify/role_grafana.sql

@@ -4,9 +4,13 @@
 
 BEGIN;
 
+\set role_grafana_username `cat /run/secrets/postgres_role_grafana_username`
+
+SET LOCAL sqitch.role_grafana_username TO :'role_grafana_username';
+
 DO $$
 BEGIN
-  ASSERT (SELECT pg_catalog.pg_has_role('grafana', 'USAGE'));
+  ASSERT (SELECT pg_catalog.pg_has_role(current_setting('sqitch.role_grafana_username'), 'USAGE'));
   -- Other accounts might not exist yet for a NOT-check.
 END $$;