Skip to content

fix(tree): list databases when the role lacks CONNECT on some cluster databases #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brains-fatman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tree): list databases when the role lacks CONNECT on some cluster databases #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/providers/tree/loaders/ConnectionLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,11 @@ export class ConnectionLoader extends BaseLoader {
const cacheKey = SchemaCache.buildKey(element.connectionId!, dbName, undefined, 'databases');
const dbResult = await (provider as any)._cache.getOrFetch(cacheKey, async () => {
return await client.query(`
SELECT datname, pg_size_pretty(pg_database_size(datname)) as size
FROM pg_database
SELECT datname,
CASE WHEN has_database_privilege(datname, 'CONNECT')
THEN pg_size_pretty(pg_database_size(datname))
END as size
FROM pg_database
ORDER BY datname
`);
});
Expand Down Expand Up @@ -128,7 +131,10 @@ export class ConnectionLoader extends BaseLoader {

case 'system-databases-group': {
const systemDbResult = await client.query(
`SELECT datname, pg_size_pretty(pg_database_size(datname)) as size
`SELECT datname,
CASE WHEN has_database_privilege(datname, 'CONNECT')
THEN pg_size_pretty(pg_database_size(datname))
END as size
FROM pg_database
WHERE datname = ANY($1)
ORDER BY datname`,
Expand Down