hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1145 sysadmin用户通过\dn应该要看到所有的schema

Browse Source 
Merge pull request !1145 from TotaJ/schema
This commit is contained in:
opengauss-bot
2021-08-25 11:18:11 +00:00
committed by Gitee
parent 121f1c25c7 e3de9a3318
commit fe2d3082f3
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/psql/describe.cpp
View File

@ -3765,8 +3765,6 @@ bool listSchemas(const char* pattern, bool verbose, bool showSystem)
PQExpBufferData buf;
PGresult* res = NULL;
printQueryOpt myopt = pset.popt;
const char* username = session_username();
bool havewhere = false;
initPQExpBuffer(&buf);
printfPQExpBuffer(&buf,
@ -3786,19 +3784,10 @@ bool listSchemas(const char* pattern, bool verbose, bool showSystem)
if (!showSystem && (pattern == NULL)) {
appendPQExpBuffer(&buf, "WHERE n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'\n");
havewhere = true;
}
havewhere |= processSQLNamePattern(
pset.db, &buf, pattern, havewhere, false, NULL, "n.nspname", NULL, NULL);
if (!is_superuser()) {
if (havewhere) {
appendPQExpBuffer(&buf, " AND pg_catalog.pg_get_userbyid(n.nspowner) = \'%s\' \n", username);
} else {
appendPQExpBuffer(&buf, " WHERE pg_catalog.pg_get_userbyid(n.nspowner) = \'%s\' \n", username);
}
}
processSQLNamePattern(
pset.db, &buf, pattern, !showSystem && (pattern == NULL), false, NULL, "n.nspname", NULL, NULL);
appendPQExpBuffer(&buf, "ORDER BY 1;");