diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-17 04:53:46 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-17 04:53:46 +0000 |
| commit | b37bc65f44eb16e98212fc61b565bb86502812fd (patch) | |
| tree | 0058866f3e0dcc08a98a534eee73cea7bd53bc3e /src/bin/psql/psql.c | |
| parent | c65ea0e040f08b59407cd74f8f0f0dd190169d46 (diff) | |
| download | postgresql-b37bc65f44eb16e98212fc61b565bb86502812fd.tar.gz postgresql-b37bc65f44eb16e98212fc61b565bb86502812fd.zip | |
Creates the SubLink structure, and the Query->hasSubLink field,
with supporting code.
Creates SubLink node in gram.y.
psql.c patch for newatttypmod field.
Diffstat (limited to 'src/bin/psql/psql.c')
| -rw-r--r-- | src/bin/psql/psql.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 1f5e7d9d44d..b2d4b434269 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.125 1998/01/09 19:34:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.126 1998/01/17 04:53:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -562,7 +562,7 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout) char *rnotnull; char *rhasdef; int i; - int rsize; + int attlen, atttypmod; PGresult *res, *res2; int usePipe = 0; char *pagerenv; @@ -598,7 +598,8 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout) } descbuf[0] = '\0'; - strcat(descbuf, "SELECT a.attnum, a.attname, t.typname, a.attlen, a.attnotnull, a.atthasdef "); + strcat(descbuf, "SELECT a.attnum, a.attname, t.typname, a.attlen, "); + strcat(descbuf, "a.atttypmod, a.attnotnull, a.atthasdef "); strcat(descbuf, "FROM pg_class c, pg_attribute a, pg_type t "); strcat(descbuf, "WHERE c.relname = '"); strcat(descbuf, table); @@ -643,9 +644,10 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout) fprintf(fout,"| %-32.32s | ", PQgetvalue(res, i, 1)); rtype = PQgetvalue(res, i, 2); - rsize = atoi(PQgetvalue(res, i, 3)); - rnotnull = PQgetvalue(res, i, 4); - rhasdef = PQgetvalue(res, i, 5); + attlen = atoi(PQgetvalue(res, i, 3)); + atttypmod = atoi(PQgetvalue(res, i, 4)); + rnotnull = PQgetvalue(res, i, 5); + rhasdef = PQgetvalue(res, i, 6); strcpy(type_str, rtype); if (strcmp(rtype, "bpchar") == 0) @@ -687,11 +689,11 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout) fprintf(fout,"%6s |", "var"); else if (strcmp(rtype, "bpchar") == 0 || strcmp(rtype, "varchar") == 0) - fprintf(fout,"%6i |", rsize > 0 ? rsize - VARHDRSZ : 0); + fprintf(fout,"%6i |", atttypmod > 0 ? atttypmod - VARHDRSZ : 0); else { - if (rsize > 0) - fprintf(fout,"%6i |", rsize); + if (attlen > 0) + fprintf(fout,"%6i |", attlen); else fprintf(fout,"%6s |", "var"); } |