diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/access/common/tupdesc.c | 4 | ||||
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 3 | ||||
-rw-r--r-- | src/backend/catalog/heap.c | 14 | ||||
-rw-r--r-- | src/backend/catalog/index.c | 16 | ||||
-rw-r--r-- | src/backend/commands/sequence.c | 2 | ||||
-rw-r--r-- | src/backend/executor/execUtils.c | 3 | ||||
-rw-r--r-- | src/backend/parser/parse_expr.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/varchar.c | 6 |
8 files changed, 27 insertions, 25 deletions
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index f23c8e86572..e3f719a0f3b 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.32 1998/01/16 23:19:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.33 1998/02/07 06:10:30 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -301,7 +301,7 @@ TupleDescInitEntry(TupleDesc desc, att->attdisbursion = 0; /* dummy value */ att->attcacheoff = -1; - att->atttypmod = 0; + att->atttypmod = -1; att->attnum = attributeNumber; att->attnelems = attdim; diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index ad3d044a681..eea4c71759c 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.34 1998/02/06 19:18:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.35 1998/02/07 06:10:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -627,6 +627,7 @@ DefineAttr(char *name, char *type, int attnum) attrtypes[attnum]->attbyval = (attlen == 1) || (attlen == 2) || (attlen == 4); } attrtypes[attnum]->attcacheoff = -1; + attrtypes[attnum]->atttypmod = -1; } diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 500aaecaacf..5d2c8bb7b6b 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.44 1998/02/05 19:02:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.45 1998/02/07 06:10:39 momjian Exp $ * * INTERFACE ROUTINES * heap_create() - Create an uncataloged heap relation @@ -97,32 +97,32 @@ static void RemoveConstraints(Relation rel); static FormData_pg_attribute a1 = { 0xffffffff, {"ctid"}, 27l, 0l, sizeof(ItemPointerData), - SelfItemPointerAttributeNumber, 0, -1, 0, '\0', '\0', 'i', '\0', '\0' + SelfItemPointerAttributeNumber, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }; static FormData_pg_attribute a2 = { 0xffffffff, {"oid"}, 26l, 0l, sizeof(Oid), - ObjectIdAttributeNumber, 0, -1, 0, '\001', '\0', 'i', '\0', '\0' + ObjectIdAttributeNumber, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }; static FormData_pg_attribute a3 = { 0xffffffff, {"xmin"}, 28l, 0l, sizeof(TransactionId), - MinTransactionIdAttributeNumber, 0, -1, 0, '\0', '\0', 'i', '\0', '\0' + MinTransactionIdAttributeNumber, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }; static FormData_pg_attribute a4 = { 0xffffffff, {"cmin"}, 29l, 0l, sizeof(CommandId), - MinCommandIdAttributeNumber, 0, -1, 0, '\001', '\0', 'i', '\0', '\0' + MinCommandIdAttributeNumber, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }; static FormData_pg_attribute a5 = { 0xffffffff, {"xmax"}, 28l, 0l, sizeof(TransactionId), - MaxTransactionIdAttributeNumber, 0, -1, 0, '\0', '\0', 'i', '\0', '\0' + MaxTransactionIdAttributeNumber, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }; static FormData_pg_attribute a6 = { 0xffffffff, {"cmax"}, 29l, 0l, sizeof(CommandId), - MaxCommandIdAttributeNumber, 0, -1, 0, '\001', '\0', 'i', '\0', '\0' + MaxCommandIdAttributeNumber, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }; static AttributeTupleForm HeapAtt[] = diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 6772f8b6658..1295b3e6d03 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.36 1998/01/16 23:19:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.37 1998/02/07 06:10:49 momjian Exp $ * * * INTERFACE ROUTINES @@ -118,12 +118,12 @@ DefaultBuild(Relation heapRelation, Relation indexRelation, * ---------------------------------------------------------------- */ static FormData_pg_attribute sysatts[] = { - {0l, {"ctid"}, 27l, 0l, 6, -1, 0, -1, 0, '\0', '\0', 'i', '\0', '\0'}, - {0l, {"oid"}, 26l, 0l, 4, -2, 0, -1, 0, '\001', '\0', 'i', '\0', '\0'}, - {0l, {"xmin"}, 28l, 0l, 4, -3, 0, -1, 0, '\0', '\0', 'i', '\0', '\0'}, - {0l, {"cmin"}, 29l, 0l, 4, -4, 0, -1, 0, '\001', '\0', 'i', '\0', '\0'}, - {0l, {"xmax"}, 28l, 0l, 4, -5, 0, -1, 0, '\0', '\0', 'i', '\0', '\0'}, - {0l, {"cmax"}, 29l, 0l, 4, -6, 0, -1, 0, '\001', '\0', 'i', '\0', '\0'}, + {0l, {"ctid"}, 27l, 0l, 6, -1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, + {0l, {"oid"}, 26l, 0l, 4, -2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, + {0l, {"xmin"}, 28l, 0l, 4, -3, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, + {0l, {"cmin"}, 29l, 0l, 4, -4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, + {0l, {"xmax"}, 28l, 0l, 4, -5, 0, -1, -1, '\0', '\0', 'i', '\0', '\0'}, + {0l, {"cmax"}, 29l, 0l, 4, -6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'}, }; /* ---------------------------------------------------------------- @@ -437,7 +437,7 @@ ConstructTupleDescriptor(Oid heapoid, ((AttributeTupleForm) to)->attnotnull = false; ((AttributeTupleForm) to)->atthasdef = false; - ((AttributeTupleForm) to)->atttypmod = 0; + ((AttributeTupleForm) to)->atttypmod = -1; /* * if the keytype is defined, we need to change the tuple form's diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 58008dd1382..9f3b27ba6d5 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -98,7 +98,7 @@ DefineSequence(CreateSeqStmt *seq) typnam = makeNode(TypeName); typnam->setof = FALSE; typnam->arrayBounds = NULL; - typnam->typmod = 0; + typnam->typmod = -1; coldef = makeNode(ColumnDef); coldef->typename = typnam; coldef->defval = NULL; diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 7368548465d..244bfdaa401 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.26 1998/01/20 05:03:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.27 1998/02/07 06:11:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -531,6 +531,7 @@ ExecSetTypeInfo(int index, att->attproc = 0; /* dummy value */ att->attnelems = 0; /* dummy value */ att->attcacheoff = -1; + att->atttypmod = -1; att->attisset = false; att->attalign = attalign; } diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 7daf1617dcf..b202ff4e9e5 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.17 1998/02/06 16:46:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.18 1998/02/07 06:11:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -101,7 +101,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) Value *val = &con->val; if (con->typename != NULL) - result = parser_typecast(val, con->typename, 0); + result = parser_typecast(val, con->typename, -1); else result = (Node *) make_const(val); break; diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index dbfe54e5725..ce87c1a78cc 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.25 1998/02/05 17:22:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.26 1998/02/07 06:11:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ bpcharin(char *s, int dummy, int atttypmod) if (s == NULL) return ((char *) NULL); - if (atttypmod < 1) + if (atttypmod == -1) { /* @@ -133,7 +133,7 @@ varcharin(char *s, int dummy, int atttypmod) return ((char *) NULL); len = strlen(s) + VARHDRSZ; - if (atttypmod > 0 && len > atttypmod) + if (atttypmod != -1 && len > atttypmod) len = atttypmod; /* clip the string at max length */ if (len > 4096) |