database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Have psql \d show the value of sequence columns.

Browse Source 
Dickson S. Guedes
This commit is contained in:
Bruce Momjian
2008-07-15 03:16:03 +00:00
parent da0a9f1d5a
commit 8516ce0914
1 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/bin/psql/describe.c
View File

@ -8,7 +8,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.179 2008/07/14 23:13:04 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.180 2008/07/15 03:16:03 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -811,7 +811,8 @@ describeOneTableDetails(const char *schemaname,
printTableContent cont; printTableContent cont;
int i; int i;
char *view_def = NULL; char *view_def = NULL;
char *headers[5]; char *headers[6];
char **seq_values = NULL;
char **modifiers = NULL; char **modifiers = NULL;
char **ptr; char **ptr;
PQExpBufferData title; PQExpBufferData title;
@ -869,6 +870,35 @@ describeOneTableDetails(const char *schemaname,
tableinfo.tablespace = (pset.sversion >= 80000) ? tableinfo.tablespace = (pset.sversion >= 80000) ?
atooid(PQgetvalue(res, 0, 6)) : 0; atooid(PQgetvalue(res, 0, 6)) : 0;
PQclear(res); PQclear(res);
/*
* This is used to get the values of a sequence and store it in an
* array that will be used later.
*/
if (tableinfo.relkind == 'S')
{
PGresult *result;
#define SEQ_NUM_COLS 10
printfPQExpBuffer(&buf,
"SELECT sequence_name, last_value, \n"
" start_value, increment_by, \n"
" max_value, min_value, cache_value, \n"
" log_cnt, is_cycled, is_called \n"
"FROM \"%s\"",
relationname);
result = PSQLexec(buf.data, false);
if (!result)
goto error_return;
seq_values = pg_malloc_zero((SEQ_NUM_COLS+1) * sizeof(*seq_values));
for (i = 0; i < SEQ_NUM_COLS; i++)
seq_values[i] = pg_strdup(PQgetvalue(result, 0, i));
PQclear(result);
}
/* Get column info (index requires additional checks) */ /* Get column info (index requires additional checks) */
printfPQExpBuffer(&buf, "SELECT a.attname,"); printfPQExpBuffer(&buf, "SELECT a.attname,");
@ -932,7 +962,7 @@ describeOneTableDetails(const char *schemaname,
} }
/* Set the number of columns, and their names */ /* Set the number of columns, and their names */
cols = 2; cols += 2;
headers[0] = gettext_noop("Column"); headers[0] = gettext_noop("Column");
headers[1] = gettext_noop("Type"); headers[1] = gettext_noop("Type");
@ -943,6 +973,9 @@ describeOneTableDetails(const char *schemaname,
modifiers = pg_malloc_zero((numrows + 1) * sizeof(*modifiers)); modifiers = pg_malloc_zero((numrows + 1) * sizeof(*modifiers));
} }
if (tableinfo.relkind == 'S')
headers[cols++] = gettext_noop("Value");
if (verbose) if (verbose)
{ {
headers[cols++] = gettext_noop("Storage"); headers[cols++] = gettext_noop("Storage");
@ -980,7 +1013,11 @@ describeOneTableDetails(const char *schemaname,
/* Type */ /* Type */
printTableAddCell(&cont, PQgetvalue(res, i, 1), false); printTableAddCell(&cont, PQgetvalue(res, i, 1), false);
/* A special 'Value' column for sequences */
if (tableinfo.relkind == 'S')
printTableAddCell(&cont, seq_values[i], false);
/* Extra: not null and default */ /* Extra: not null and default */
if (show_modifiers) if (show_modifiers)
{ {
@ -1543,7 +1580,14 @@ error_return:
termPQExpBuffer(&buf); termPQExpBuffer(&buf);
termPQExpBuffer(&title); termPQExpBuffer(&title);
termPQExpBuffer(&tmpbuf); termPQExpBuffer(&tmpbuf);
if (tableinfo.relkind == 'S')
{
for (ptr = seq_values; *ptr; ptr++)
free(*ptr);
free(seq_values);
}
if (show_modifiers) if (show_modifiers)
{ {
for (ptr = modifiers; *ptr; ptr++) for (ptr = modifiers; *ptr; ptr++)