diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/tupdesc.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_attribute.h | 8 | ||||
| -rw-r--r-- | src/include/catalog/pg_type.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/makefuncs.h | 6 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 6 | ||||
| -rw-r--r-- | src/include/parser/parse_expr.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_type.h | 4 | ||||
| -rw-r--r-- | src/include/utils/builtins.h | 6 | ||||
| -rw-r--r-- | src/include/utils/lsyscache.h | 4 |
10 files changed, 21 insertions, 28 deletions
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 4871745be04..4af80270684 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.14 1998/02/10 04:02:13 momjian Exp $ + * $Id: tupdesc.h,v 1.15 1998/02/10 16:03:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,7 +69,7 @@ extern bool TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, char *attributeName, Oid typeid, - int typmod, + int16 typmod, int attdim, bool attisset); diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index a4a9dc3884e..6a075dad57d 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.26 1998/02/10 04:02:16 momjian Exp $ + * $Id: pg_attribute.h,v 1.27 1998/02/10 16:04:03 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -89,12 +89,6 @@ CATALOG(pg_attribute) BOOTSTRAP /* * atttypmod records type-specific modifications supplied at table * creation time. - * This is not integrated into all areas of the source. It is in - * TypeName to pass typmod info from the parser during table creation - * time, and it is used in the parser when converting a string to a - * typed constant associated with a variable. We also have a hack in - * execMain.c/execUtils.c that uses atttypmod to properly create tables - * for SELECT * INTO TABLE test2 FROM test; */ bool attbyval; diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 56065752a86..f3e68b9f372 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.32 1998/02/10 04:02:17 momjian Exp $ + * $Id: pg_type.h,v 1.33 1998/02/10 16:04:10 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -367,7 +367,6 @@ DESCR("limited-range ISO-format date and time"); #define TIMESTAMPOID 1296 -#define USE_ATTTYPMOD(typeid) ((typeid) == BPCHAROID || (typeid) == VARCHAROID) #define VARLENA_FIXED_SIZE(attr) ((attr)->atttypid == BPCHAROID && (attr)->atttypmod > 0) /* diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 8b7cb299e03..6fefdce5f39 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.8 1998/02/10 04:02:23 momjian Exp $ + * $Id: makefuncs.h,v 1.9 1998/02/10 16:04:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,14 +25,14 @@ extern Oper * makeOper(Oid opno, extern Var * makeVar(Index varno, AttrNumber varattno, Oid vartype, - int vartypmod, + int16 vartypmod, Index varlevelsup, Index varnoold, AttrNumber varoattno); extern Resdom * makeResdom(AttrNumber resno, Oid restype, - int restypmod, + int16 restypmod, char *resname, Index reskey, Oid reskeyop, diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index fc30cbf3e0a..108949f8c78 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.46 1998/01/17 04:53:40 momjian Exp $ + * $Id: parsenodes.h,v 1.47 1998/02/10 16:04:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -643,7 +643,7 @@ typedef struct TypeName char *name; /* name of the type */ bool timezone; /* timezone specified? */ bool setof; /* is a set? */ - int2 typmod; /* type modifier */ + int16 typmod; /* type modifier */ List *arrayBounds; /* array bounds */ } TypeName; diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 3907e457c3a..6a37bc1b204 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.17 1998/02/10 04:02:32 momjian Exp $ + * $Id: primnodes.h,v 1.18 1998/02/10 16:04:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ typedef struct Resdom NodeTag type; AttrNumber resno; Oid restype; - int restypmod; + int16 restypmod; char *resname; Index reskey; Oid reskeyop; @@ -124,7 +124,7 @@ typedef struct Var Index varno; AttrNumber varattno; Oid vartype; - int vartypmod; + int16 vartypmod; Index varlevelsup; /* erased by upper optimizer */ Index varnoold; /* only used by optimizer */ AttrNumber varoattno; /* only used by optimizer */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index b328cc5e5ca..e533741ec25 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.6 1998/01/20 05:04:47 momjian Exp $ + * $Id: parse_expr.h,v 1.7 1998/02/10 16:04:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence); extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence); extern Oid exprType(Node *expr); -extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int attypmod); +extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int16 attypmod); #endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 22a81c4994f..cca43855c51 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_type.h,v 1.3 1998/01/16 23:21:03 momjian Exp $ + * $Id: parse_type.h,v 1.4 1998/02/10 16:04:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ extern int16 typeLen(Type t); extern bool typeByVal(Type t); extern char *typeTypeName(Type t); extern char typeTypeFlag(Type t); -extern char *stringTypeString(Type tp, char *string, int atttypmod); +extern char *stringTypeString(Type tp, char *string, int16 atttypmod); extern Oid typeidRetoutfunc(Oid type_id); extern Oid typeidTypeRelid(Oid type_id); extern Oid typeTypeRelid(Type typ); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index c37d95fa87e..7ff819940b7 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.35 1998/02/02 03:11:37 scrappy Exp $ + * $Id: builtins.h,v 1.36 1998/02/10 16:04:36 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -445,7 +445,7 @@ DateTime *timestamp_datetime(time_t timestamp); time_t datetime_timestamp(DateTime *datetime); /* varchar.c */ -extern char *bpcharin(char *s, int dummy, int atttypmod); +extern char *bpcharin(char *s, int dummy, int16 atttypmod); extern char *bpcharout(char *s); extern bool bpchareq(char *arg1, char *arg2); extern bool bpcharne(char *arg1, char *arg2); @@ -457,7 +457,7 @@ extern int32 bpcharcmp(char *arg1, char *arg2); extern int32 bpcharlen(char *arg); extern uint32 hashbpchar(struct varlena * key); -extern char *varcharin(char *s, int dummy, int atttypmod); +extern char *varcharin(char *s, int dummy, int16 atttypmod); extern char *varcharout(char *s); extern bool varchareq(char *arg1, char *arg2); extern bool varcharne(char *arg1, char *arg2); diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 1d411cfbe53..b1b402d897b 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.8 1998/01/24 22:50:48 momjian Exp $ + * $Id: lsyscache.h,v 1.9 1998/02/10 16:04:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ extern char *get_attname(Oid relid, AttrNumber attnum); extern AttrNumber get_attnum(Oid relid, char *attname); extern Oid get_atttype(Oid relid, AttrNumber attnum); extern bool get_attisset(Oid relid, char *attname); -extern int get_atttypmod(Oid relid, AttrNumber attnum); +extern int16 get_atttypmod(Oid relid, AttrNumber attnum); extern RegProcedure get_opcode(Oid opid); extern char *get_opname(Oid opid); extern bool op_mergesortable(Oid opid, Oid ltype, Oid rtype, |