aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/common/tupdesc.c6
-rw-r--r--src/backend/catalog/index.c4
-rw-r--r--src/backend/commands/copy.c10
-rw-r--r--src/backend/nodes/makefuncs.c6
-rw-r--r--src/backend/optimizer/prep/preptlist.c4
-rw-r--r--src/backend/parser/parse_expr.c8
-rw-r--r--src/backend/parser/parse_func.c4
-rw-r--r--src/backend/parser/parse_node.c4
-rw-r--r--src/backend/parser/parse_target.c14
-rw-r--r--src/backend/parser/parse_type.c4
-rw-r--r--src/backend/utils/adt/arrayfuncs.c8
-rw-r--r--src/backend/utils/adt/varchar.c6
-rw-r--r--src/backend/utils/cache/lsyscache.c6
13 files changed, 42 insertions, 42 deletions
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 39b6ebeb72a..f096c1b8870 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.40 1998/06/15 19:27:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.41 1998/07/12 21:29:13 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -255,7 +255,7 @@ TupleDescInitEntry(TupleDesc desc,
AttrNumber attributeNumber,
char *attributeName,
Oid typeid,
- int16 typmod,
+ int32 typmod,
int attdim,
bool attisset)
{
@@ -448,7 +448,7 @@ BuildDescForRelation(List *schema, char *relname)
TupleConstr *constr = (TupleConstr *) palloc(sizeof(TupleConstr));
char *attname;
char *typename;
- int16 atttypmod;
+ int32 atttypmod;
int attdim;
int ndef = 0;
bool attisset;
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 463cbf17542..442bbd679d4 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.43 1998/06/15 19:28:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.44 1998/07/12 21:29:13 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -107,7 +107,7 @@ DefaultBuild(Relation heapRelation, Relation indexRelation,
* AttrNumber attnum;
* uint32 attnelems;
* int32 attcacheoff;
- * int16 atttypmod;
+ * int32 atttypmod;
* bool attbyval;
* bool attisset;
* char attalign;
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 86ae89f0e70..06129e8472d 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.47 1998/06/19 11:40:46 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.48 1998/07/12 21:29:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -205,7 +205,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
FmgrInfo *out_functions;
Oid out_func_oid;
Oid *elements;
- int16 *typmod;
+ int32 *typmod;
Datum value;
bool isnull; /* The attribute we are copying is null */
char *nulls;
@@ -231,7 +231,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
{
out_functions = (FmgrInfo *) palloc(attr_count * sizeof(FmgrInfo));
elements = (Oid *) palloc(attr_count * sizeof(Oid));
- typmod = (int16 *) palloc(attr_count * sizeof(int16));
+ typmod = (int32 *) palloc(attr_count * sizeof(int16));
for (i = 0; i < attr_count; i++)
{
out_func_oid = (Oid) GetOutputFunction(attr[i]->atttypid);
@@ -378,7 +378,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
tuples_read = 0;
bool reading_to_eof = true;
Oid *elements;
- int16 *typmod;
+ int32 *typmod;
FuncIndexInfo *finfo,
**finfoP = NULL;
TupleDesc *itupdescArr;
@@ -499,7 +499,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
{
in_functions = (FmgrInfo *) palloc(attr_count * sizeof(FmgrInfo));
elements = (Oid *) palloc(attr_count * sizeof(Oid));
- typmod = (int16 *) palloc(attr_count * sizeof(int16));
+ typmod = (int32 *) palloc(attr_count * sizeof(int16));
for (i = 0; i < attr_count; i++)
{
in_func_oid = (Oid) GetInputFunction(attr[i]->atttypid);
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 4a9581bd1ee..574860a5452 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.9 1998/02/26 04:32:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.10 1998/07/12 21:29:16 momjian Exp $
*
* NOTES
* Creator functions in POSTGRES 4.2 are generated automatically. Most of
@@ -53,7 +53,7 @@ Var *
makeVar(Index varno,
AttrNumber varattno,
Oid vartype,
- int16 vartypmod,
+ int32 vartypmod,
Index varlevelsup,
Index varnoold,
AttrNumber varoattno)
@@ -78,7 +78,7 @@ makeVar(Index varno,
Resdom *
makeResdom(AttrNumber resno,
Oid restype,
- int16 restypmod,
+ int32 restypmod,
char *resname,
Index reskey,
Oid reskeyop,
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 3f97f7bda6c..f5eb33db22b 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.11 1998/06/15 19:28:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.12 1998/07/12 21:29:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -319,7 +319,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type)
temp_list = MakeTLE(makeResdom(attno,
atttype,
- get_atttypmod(relid, attno),
+ get_atttypmod(relid, attno),
attname,
0,
(Oid) 0,
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index cedf72f3c8b..5a12754425c 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.31 1998/07/08 14:04:10 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.32 1998/07/12 21:29:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@
#include "parser/parse_target.h"
#include "utils/builtins.h"
-static Node *parser_typecast(Value *expr, TypeName *typename, int16 atttypmod);
+static Node *parser_typecast(Value *expr, TypeName *typename, int32 atttypmod);
/*
* transformExpr -
@@ -433,7 +433,7 @@ exprType(Node *expr)
}
static Node *
-parser_typecast(Value *expr, TypeName *typename, int16 atttypmod)
+parser_typecast(Value *expr, TypeName *typename, int32 atttypmod)
{
/* check for passing non-ints */
Const *adt;
@@ -513,7 +513,7 @@ parser_typecast(Value *expr, TypeName *typename, int16 atttypmod)
* Convert (only) constants to specified type.
*/
Node *
-parser_typecast2(Node *expr, Oid exprType, Type tp, int16 atttypmod)
+parser_typecast2(Node *expr, Oid exprType, Type tp, int32 atttypmod)
{
/* check for passing non-ints */
Const *adt;
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index d972876f2f5..7da19487439 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.20 1998/07/08 14:04:10 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.21 1998/07/12 21:29:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1220,7 +1220,7 @@ setup_tlist(char *attname, Oid relid)
Resdom *resnode;
Var *varnode;
Oid typeid;
- int16 type_mod;
+ int32 type_mod;
int attno;
attno = get_attnum(relid, attname);
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1b0982d3bce..dd7e18e910b 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.16 1998/05/29 14:00:21 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.17 1998/07/12 21:29:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -222,7 +222,7 @@ make_var(ParseState *pstate, Oid relid, char *refname,
int vnum,
attid;
Oid vartypeid;
- int16 type_mod;
+ int32 type_mod;
int sublevels_up;
vnum = refnameRangeTablePosn(pstate, refname, &sublevels_up);
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index ceb489990a7..4dda58a2c78 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.17 1998/07/08 14:04:11 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.18 1998/07/12 21:29:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,7 +41,7 @@ Node *
SizeTargetExpr(ParseState *pstate,
Node *expr,
Oid attrtype,
- int16 attrtypmod);
+ int32 attrtypmod);
/* transformTargetIdent()
@@ -92,7 +92,7 @@ transformTargetIdent(ParseState *pstate,
resdomno_target;
RangeTblEntry *rte;
char *target_colname;
- int16 attrtypmod,
+ int32 attrtypmod,
attrtypmod_target;
target_colname = *resname;
@@ -154,7 +154,7 @@ printf("transformTargetIdent- transform type %d to %d\n",
if (expr == NULL)
{
char *name;
- int16 type_mod;
+ int32 type_mod;
name = ((*resname != NULL)? *resname: colname);
@@ -333,7 +333,7 @@ printf("transformTargetList: decode T_Expr\n");
case T_Attr:
{
Oid type_id;
- int16 type_mod;
+ int32 type_mod;
Attr *att = (Attr *) res->val;
Node *result;
char *attrname;
@@ -507,7 +507,7 @@ Node *
SizeTargetExpr(ParseState *pstate,
Node *expr,
Oid attrtype,
- int16 attrtypmod)
+ int32 attrtypmod)
{
int i;
HeapTuple ftup;
@@ -579,7 +579,7 @@ MakeTargetlistExpr(ParseState *pstate,
{
Oid type_id,
attrtype;
- int16 type_mod,
+ int32 type_mod,
attrtypmod;
int resdomno;
Relation rd;
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index c611c589c46..ea6a4a096b9 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.11 1998/06/15 19:28:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.12 1998/07/12 21:29:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -138,7 +138,7 @@ typeTypeFlag(Type t)
/* Given a type structure and a string, returns the internal form of
that string */
char *
-stringTypeString(Type tp, char *string, int16 atttypmod)
+stringTypeString(Type tp, char *string, int32 atttypmod)
{
Oid op;
Oid typelem;
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 3b60534278f..b3c898cbcf4 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.30 1998/06/15 19:29:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.31 1998/07/12 21:29:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@
static int _ArrayCount(char *str, int dim[], int typdelim);
static char *
_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[],
- FmgrInfo *inputproc, Oid typelem, int16 typmod,
+ FmgrInfo *inputproc, Oid typelem, int32 typmod,
char typdelim, int typlen, bool typbyval,
char typalign, int *nbytes);
@@ -94,7 +94,7 @@ static char *array_seek(char *ptr, int eltsize, int nitems);
char *
array_in(char *string, /* input array in external form */
Oid element_type, /* type OID of an array element */
- int16 typmod)
+ int32 typmod)
{
int typlen;
bool typbyval,
@@ -360,7 +360,7 @@ _ReadArrayStr(char *arrayStr,
FmgrInfo *inputproc, /* function used for the
* conversion */
Oid typelem,
- int16 typmod,
+ int32 typmod,
char typdelim,
int typlen,
bool typbyval,
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index be7130896ef..29ffacd014f 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.34 1998/06/16 06:41:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.35 1998/07/12 21:29:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ char *convertstr(char *, int, int);
* because we pass typelem as the second argument for array_in.)
*/
char *
-bpcharin(char *s, int dummy, int16 atttypmod)
+bpcharin(char *s, int dummy, int32 atttypmod)
{
char *result,
*r;
@@ -291,7 +291,7 @@ printf("bpchar- convert string length %d (%d) ->%d\n",
* because we pass typelem as the second argument for array_in.)
*/
char *
-varcharin(char *s, int dummy, int16 atttypmod)
+varcharin(char *s, int dummy, int32 atttypmod)
{
char *result;
int len;
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 08ee8ea2dd8..97b739195e6 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.14 1998/06/15 19:29:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.15 1998/07/12 21:29:24 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -161,7 +161,7 @@ get_attisset(Oid relid, char *attname)
* return the "atttypmod" field from the attribute relation.
*
*/
-int16
+int32
get_atttypmod(Oid relid, AttrNumber attnum)
{
FormData_pg_attribute att_tup;
@@ -169,7 +169,7 @@ get_atttypmod(Oid relid, AttrNumber attnum)
if (SearchSysCacheStruct(ATTNUM,
(char *) &att_tup,
ObjectIdGetDatum(relid),
- UInt16GetDatum(attnum),
+ Int32GetDatum(attnum),
0, 0))
return att_tup.atttypmod;
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 06:43:15 +0000