diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-16 23:21:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-16 23:21:07 +0000 |
| commit | c65ea0e040f08b59407cd74f8f0f0dd190169d46 (patch) | |
| tree | 5d46c03cb5ddd61ed5e0693b261965cb2fae8b95 /src/backend/parser/parse_target.c | |
| parent | d7427e4802fd4d7108e37544115cab83c13172ab (diff) | |
| download | postgresql-c65ea0e040f08b59407cd74f8f0f0dd190169d46.tar.gz postgresql-c65ea0e040f08b59407cd74f8f0f0dd190169d46.zip | |
New pg_attribute.atttypmod for type-specific information like
varchar length.
Cleans up code so attlen is always length.
Removed varchar() hack added earlier.
Will fix bug in selecting varchar() fields, and varchar() can be
variable length.
Diffstat (limited to 'src/backend/parser/parse_target.c')
| -rw-r--r-- | src/backend/parser/parse_target.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index eccdbda6b4e..895411aa1da 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.5 1998/01/05 03:32:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.6 1998/01/16 23:20:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -326,7 +326,8 @@ make_targetlist_expr(ParseState *pstate, Oid type_id, attrtype; int type_len, - attrlen; + attrlen, + attrtypmod; int resdomno; Relation rd; bool attrisset; @@ -360,14 +361,8 @@ make_targetlist_expr(ParseState *pstate, attrtype = attnumTypeId(rd, resdomno); if ((arrayRef != NIL) && (lfirst(arrayRef) == NIL)) attrtype = GetArrayElementType(attrtype); - if (attrtype == BPCHAROID || attrtype == VARCHAROID) - { - attrlen = rd->rd_att->attrs[resdomno - 1]->attlen; - } - else - { - attrlen = typeLen(typeidType(attrtype)); - } + attrlen = typeLen(typeidType(attrtype)); + attrtypmod = rd->rd_att->attrs[resdomno - 1]->atttypmod; #if 0 if (Input_is_string && Typecast_ok) { @@ -438,13 +433,13 @@ make_targetlist_expr(ParseState *pstate, expr = (Node *) parser_typecast2(expr, type_id, typeidType(typelem), - attrlen); + attrtypmod); } else expr = (Node *) parser_typecast2(expr, type_id, typeidType(attrtype), - attrlen); + attrtypmod); } else { |