Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit04dfc87

Browse files
committed
If a role has a password expiration date, show that in psql's \du output.
Per a suggestion from Euler Taveira, it seems like a good idea to includethis information in \du (and \dg) output. This costs nothing for peoplewho are not using the VALID UNTIL feature, while for those who are, it'srather critical information.Fabrízio de Royes Mello
1 parentf2386d7 commit04dfc87

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,12 +1267,15 @@ testdb=>
12671267
<term><literal>\dg[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
12681268
<listitem>
12691269
<para>
1270-
Lists database roles. If <replaceable
1271-
class="parameter">pattern</replaceable> is specified, only
1272-
those roles whose names match the pattern are listed.
1273-
(This command is now effectively the same as <literal>\du</literal>).
1270+
Lists database roles.
1271+
(Since the concepts of <quote>users</> and <quote>groups</> have been
1272+
unified into <quote>roles</>, this command is now equivalent to
1273+
<literal>\du</literal>.)
1274+
If <replaceable class="parameter">pattern</replaceable> is specified,
1275+
only those roles whose names match the pattern are listed.
12741276
If the form <literal>\dg+</literal> is used, additional information
1275-
is shown about each role, including the comment for each role.
1277+
is shown about each role; currently this adds the comment for each
1278+
role.
12761279
</para>
12771280
</listitem>
12781281
</varlistentry>
@@ -1421,11 +1424,15 @@ testdb=&gt;
14211424
<term><literal>\du[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
14221425
<listitem>
14231426
<para>
1424-
Lists database roles. If <replaceable
1425-
class="parameter">pattern</replaceable> is specified, only
1426-
those roles whose names match the pattern are listed.
1427+
Lists database roles.
1428+
(Since the concepts of <quote>users</> and <quote>groups</> have been
1429+
unified into <quote>roles</>, this command is now equivalent to
1430+
<literal>\dg</literal>.)
1431+
If <replaceable class="parameter">pattern</replaceable> is specified,
1432+
only those roles whose names match the pattern are listed.
14271433
If the form <literal>\du+</literal> is used, additional information
1428-
is shown about each role, including the comment for each role.
1434+
is shown about each role; currently this adds the comment for each
1435+
role.
14291436
</para>
14301437
</listitem>
14311438
</varlistentry>

‎src/bin/psql/describe.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,7 +2378,7 @@ describeRoles(const char *pattern, bool verbose)
23782378
printfPQExpBuffer(&buf,
23792379
"SELECT r.rolname, r.rolsuper, r.rolinherit,\n"
23802380
" r.rolcreaterole, r.rolcreatedb, r.rolcanlogin,\n"
2381-
" r.rolconnlimit,\n"
2381+
" r.rolconnlimit, r.rolvaliduntil,\n"
23822382
" ARRAY(SELECT b.rolname\n"
23832383
" FROM pg_catalog.pg_auth_members m\n"
23842384
" JOIN pg_catalog.pg_roles b ON (m.roleid = b.oid)\n"
@@ -2406,7 +2406,8 @@ describeRoles(const char *pattern, bool verbose)
24062406
" u.usesuper AS rolsuper,\n"
24072407
" true AS rolinherit, false AS rolcreaterole,\n"
24082408
" u.usecreatedb AS rolcreatedb, true AS rolcanlogin,\n"
2409-
" -1 AS rolconnlimit,\n"
2409+
" -1 AS rolconnlimit,"
2410+
" u.valuntil as rolvaliduntil,\n"
24102411
" ARRAY(SELECT g.groname FROM pg_catalog.pg_group g WHERE u.usesysid = ANY(g.grolist)) as memberof"
24112412
"\nFROM pg_catalog.pg_user u\n");
24122413

@@ -2453,7 +2454,7 @@ describeRoles(const char *pattern, bool verbose)
24532454
add_role_attribute(&buf,_("Cannot login"));
24542455

24552456
if (pset.sversion >=90100)
2456-
if (strcmp(PQgetvalue(res,i, (verbose ?9 :8)),"t")==0)
2457+
if (strcmp(PQgetvalue(res,i, (verbose ?10 :9)),"t")==0)
24572458
add_role_attribute(&buf,_("Replication"));
24582459

24592460
conns=atoi(PQgetvalue(res,i,6));
@@ -2471,14 +2472,22 @@ describeRoles(const char *pattern, bool verbose)
24712472
conns);
24722473
}
24732474

2475+
if (strcmp(PQgetvalue(res,i,7),"")!=0)
2476+
{
2477+
if (buf.len>0)
2478+
appendPQExpBufferStr(&buf,"\n");
2479+
appendPQExpBufferStr(&buf,_("Password valid until "));
2480+
appendPQExpBufferStr(&buf,PQgetvalue(res,i,7));
2481+
}
2482+
24742483
attr[i]=pg_strdup(buf.data);
24752484

24762485
printTableAddCell(&cont,attr[i], false, false);
24772486

2478-
printTableAddCell(&cont,PQgetvalue(res,i,7), false, false);
2487+
printTableAddCell(&cont,PQgetvalue(res,i,8), false, false);
24792488

24802489
if (verbose&&pset.sversion >=80200)
2481-
printTableAddCell(&cont,PQgetvalue(res,i,8), false, false);
2490+
printTableAddCell(&cont,PQgetvalue(res,i,9), false, false);
24822491
}
24832492
termPQExpBuffer(&buf);
24842493

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp