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

!740 【openGauss】修复普通用户使用“\dn *.*”报错问题

Browse Source 
Merge pull request !740 from 宋清怡/master
This commit is contained in:
opengauss-bot
2021-02-27 11:57:17 +08:00
committed by Gitee
parent 851595803e 7094374fd0
commit 92a9a63214
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3752,6 +3752,7 @@ bool listSchemas(const char* pattern, bool verbose, bool showSystem)
PGresult* res = NULL; PGresult* res = NULL;
printQueryOpt myopt = pset.popt; printQueryOpt myopt = pset.popt;
const char* username = session_username(); const char* username = session_username();
bool havewhere = false;
initPQExpBuffer(&buf); initPQExpBuffer(&buf);
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
@ -3769,14 +3770,20 @@ bool listSchemas(const char* pattern, bool verbose, bool showSystem)
appendPQExpBuffer(&buf, "\nFROM pg_catalog.pg_namespace n\n"); appendPQExpBuffer(&buf, "\nFROM pg_catalog.pg_namespace n\n");
if (!showSystem && (pattern == NULL)) if (!showSystem && (pattern == NULL)) {
appendPQExpBuffer(&buf, "WHERE n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'\n"); appendPQExpBuffer(&buf, "WHERE n.nspname !~ '^pg_' AND n.nspname <> 'information_schema'\n");
havewhere = true;
}
(void)processSQLNamePattern( havewhere |= processSQLNamePattern(
pset.db, &buf, pattern, !showSystem && (pattern == NULL), false, NULL, "n.nspname", NULL, NULL); pset.db, &buf, pattern, havewhere, false, NULL, "n.nspname", NULL, NULL);
if (!is_superuser()) { if (!is_superuser()) {
if (havewhere) {
appendPQExpBuffer(&buf, " AND pg_catalog.pg_get_userbyid(n.nspowner) = \'%s\' \n", username); 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);
}
} }
appendPQExpBuffer(&buf, "ORDER BY 1;"); appendPQExpBuffer(&buf, "ORDER BY 1;");