git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c

index 56ba8b382f49ff6814753575423e625d6834ddf9..968b4218189c03c707e7d09a1fbe08f7cbf20473 100644 (file)

--- a/src/bin/psql/describe.c

+++ b/src/bin/psql/describe.c

*

* Copyright (c) 2000-2009, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.224 2009年07月07日 21:45:05 tgl Exp $

+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.225 2009年07月20日 03:46:45 tgl Exp $

*/

#include "postgres_fe.h"

*/

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",

- fmtId(schemaname));

+ printfPQExpBuffer(&buf, "SELECT * FROM %s", fmtId(schemaname));

/* must be separate because fmtId isn't reentrant */

appendPQExpBuffer(&buf, ".%s", fmtId(relationname));

- result = PSQLexec(buf.data, false);

- if (!result)

+ res = PSQLexec(buf.data, false);

+ if (!res)

goto error_return;

- seq_values = pg_malloc_zero((SEQ_NUM_COLS + 1) * sizeof(*seq_values));

+ seq_values = pg_malloc((PQnfields(res) + 1) * sizeof(*seq_values));

- for (i = 0; i < SEQ_NUM_COLS; i++)

- seq_values[i] = pg_strdup(PQgetvalue(result, 0, i));

+ for (i = 0; i < PQnfields(res); i++)

+ seq_values[i] = pg_strdup(PQgetvalue(res, 0, i));

+ seq_values[i] = NULL;

- PQclear(result);

+ PQclear(res);

+ res = NULL;

}

/* Get column info */