decouple tests from cartodb

test/CDB_Username.sql

@@ -1,17 +1,24 @@
 SELECT current_user; -- postgres
 SELECT CDB_Username(); -- (NULL)
 
--- Connect with admin
+-- Add the role fulano with an api_key and connect with it
 \set QUIET on
-\o log/test.log
+CREATE ROLE fulano LOGIN;
-SELECT current_database() AS current_database;
+GRANT USAGE ON SCHEMA cartodb TO fulano;
-\gset
+GRANT EXECUTE ON FUNCTION CDB_Username() TO fulano;
-SELECT SUBSTRING (:'current_database', 19, 36) AS user_id;
+GRANT EXECUTE ON FUNCTION _CDB_Username(text) TO fulano;
-\gset
+INSERT INTO cdb_conf (key, value) VALUES ('api_keys_fulano', '{"username": "fulanito", "permissions":[]}');
-SELECT rolname AS admin_user FROM pg_roles where rolname LIKE ('%' || :'user_id');
+SET ROLE fulano;
-\gset
-\c :current_database :admin_user
-\o
 \set QUIET off
 
-SELECT CDB_Username(); -- admin
+SELECT current_user; -- fulano
+SELECT CDB_Username(); -- fulanito
+
+-- Remove fulano
+\set QUIET on
+SET ROLE postgres;
+REVOKE USAGE ON SCHEMA cartodb FROM fulano;
+REVOKE EXECUTE ON FUNCTION CDB_Username() FROM fulano;
+REVOKE EXECUTE ON FUNCTION _CDB_Username(text) FROM fulano;
+DROP ROLE fulano;
+\set QUIET off

test/CDB_Username_expect

@@ -1,3 +1,4 @@
 postgres
 
-admin
+fulano
+fulanito