psql: \dg off by one error

Started by Josh Kupershmidtalmost 15 years ago2 messages
#1Josh Kupershmidt
schmiddy@gmail.com
1 attachment(s)

Hi all,

I noticed an off by one error in psql's verbose-mode display for \dg
and \du. In verbose mode, \dg and \du will not display the
"Replication" attribute:

test=# \dg rep
List of roles
Role name | Attributes | Member of
-----------+-------------+-----------
rep | Replication | {}

test=# \dg+ rep
List of roles
Role name | Attributes | Member of | Description
-----------+------------+-----------+-------------
rep | | {} |

Attached is a one line patch to fix.

Josh

Attachments:

psql_replication_display.patchtext/x-patch; charset=US-ASCII; name=psql_replication_display.patchDownload
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 9dc02a1..fc860cc 100644
*** a/src/bin/psql/describe.c
--- b/src/bin/psql/describe.c
*************** describeRoles(const char *pattern, bool
*** 2342,2348 ****
  			add_role_attribute(&buf, _("Cannot login"));
  
  		if (pset.sversion >= 90100)
! 			if (strcmp(PQgetvalue(res, i, 8), "t") == 0)
  				add_role_attribute(&buf, _("Replication"));
  
  		conns = atoi(PQgetvalue(res, i, 6));
--- 2342,2348 ----
  			add_role_attribute(&buf, _("Cannot login"));
  
  		if (pset.sversion >= 90100)
! 			if (strcmp(PQgetvalue(res, i, (verbose ? 9 : 8)), "t") == 0)
  				add_role_attribute(&buf, _("Replication"));
  
  		conns = atoi(PQgetvalue(res, i, 6));
#2Magnus Hagander
magnus@hagander.net
In reply to: Josh Kupershmidt (#1)
Re: psql: \dg off by one error

On Sun, Feb 27, 2011 at 01:21, Josh Kupershmidt <schmiddy@gmail.com> wrote:

Hi all,

I noticed an off by one error in psql's verbose-mode display for \dg
and \du. In verbose mode, \dg and \du will not display the
"Replication" attribute:

test=# \dg rep
           List of roles
 Role name | Attributes  | Member of
-----------+-------------+-----------
 rep       | Replication | {}

test=# \dg+ rep
                 List of roles
 Role name | Attributes | Member of | Description
-----------+------------+-----------+-------------
 rep       |            | {}        |

Attached is a one line patch to fix.

Applied, thanks.

--
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/