Commit e3f2eb1f authored by Bruce Momjian's avatar Bruce Momjian

Fix for varchar functions, and indextyple j-1 fix.

parent 82034103
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.24 1998/02/04 21:32:09 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.25 1998/02/05 17:22:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -293,7 +293,7 @@ nocache_index_getattr(IndexTuple tup, ...@@ -293,7 +293,7 @@ nocache_index_getattr(IndexTuple tup,
while (att[j]->attcacheoff > 0) while (att[j]->attcacheoff > 0)
j++; j++;
if (!VARLENA_FIXED_SIZE(att[j])) if (!VARLENA_FIXED_SIZE(att[j-1]))
off = att[j - 1]->attcacheoff + att[j - 1]->attlen; off = att[j - 1]->attcacheoff + att[j - 1]->attlen;
else else
off = att[j - 1]->attcacheoff + att[j - 1]->atttypmod; off = att[j - 1]->attcacheoff + att[j - 1]->atttypmod;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.15 1998/02/03 01:53:16 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.16 1998/02/05 17:22:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -101,7 +101,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence) ...@@ -101,7 +101,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
Value *val = &con->val; Value *val = &con->val;
if (con->typename != NULL) if (con->typename != NULL)
result = parser_typecast(val, con->typename, -1); result = parser_typecast(val, con->typename, 0);
else else
result = (Node *) make_const(val); result = (Node *) make_const(val);
break; break;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.24 1998/01/16 23:20:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.25 1998/02/05 17:22:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -60,7 +60,7 @@ bpcharin(char *s, int dummy, int atttypmod) ...@@ -60,7 +60,7 @@ bpcharin(char *s, int dummy, int atttypmod)
if (s == NULL) if (s == NULL)
return ((char *) NULL); return ((char *) NULL);
if (atttypmod == -1) if (atttypmod < 1)
{ {
/* /*
...@@ -133,7 +133,7 @@ varcharin(char *s, int dummy, int atttypmod) ...@@ -133,7 +133,7 @@ varcharin(char *s, int dummy, int atttypmod)
return ((char *) NULL); return ((char *) NULL);
len = strlen(s) + VARHDRSZ; len = strlen(s) + VARHDRSZ;
if (atttypmod != -1 && len > atttypmod) if (atttypmod > 0 && len > atttypmod)
len = atttypmod; /* clip the string at max length */ len = atttypmod; /* clip the string at max length */
if (len > 4096) if (len > 4096)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment