mirror of
https://github.com/postgres/postgres.git
synced 2025-08-22 21:53:06 +03:00
Extend pg_cast castimplicit column to a three-way value; this allows us
to be flexible about assignment casts without introducing ambiguity in operator/function resolution. Introduce a well-defined promotion hierarchy for numeric datatypes (int2->int4->int8->numeric->float4->float8). Change make_const to initially label numeric literals as int4, int8, or numeric (never float8 anymore). Explicitly mark Func and RelabelType nodes to indicate whether they came from a function call, explicit cast, or implicit cast; use this to do reverse-listing more accurately and without so many heuristics. Explicit casts to char, varchar, bit, varbit will truncate or pad without raising an error (the pre-7.2 behavior), while assigning to a column without any explicit cast will still raise an error for wrong-length data like 7.3. This more nearly follows the SQL spec than 7.2 behavior (we should be reporting a 'completion condition' in the explicit-cast cases, but we have no mechanism for that, so just do silent truncation). Fix some problems with enforcement of typmod for array elements; it didn't work at all in 'UPDATE ... SET array[n] = foo', for example. Provide a generalized array_length_coerce() function to replace the specialized per-array-type functions that used to be needed (and were missing for NUMERIC as well as all the datetime types). Add missing conversions int8<->float4, text<->numeric, oid<->int8. initdb forced.
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.211 2002/09/04 20:31:19 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.212 2002/09/18 21:35:20 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -850,6 +850,7 @@ _copyFunc(Func *from)
|
||||
newnode->funcid = from->funcid;
|
||||
newnode->funcresulttype = from->funcresulttype;
|
||||
newnode->funcretset = from->funcretset;
|
||||
newnode->funcformat = from->funcformat;
|
||||
/* Do not copy the run-time state, if any */
|
||||
newnode->func_fcache = NULL;
|
||||
|
||||
@@ -931,6 +932,7 @@ _copyRelabelType(RelabelType *from)
|
||||
Node_Copy(from, newnode, arg);
|
||||
newnode->resulttype = from->resulttype;
|
||||
newnode->resulttypmod = from->resulttypmod;
|
||||
newnode->relabelformat = from->relabelformat;
|
||||
|
||||
return newnode;
|
||||
}
|
||||
@@ -2634,7 +2636,7 @@ _copyCreateCastStmt(CreateCastStmt *from)
|
||||
Node_Copy(from, newnode, sourcetype);
|
||||
Node_Copy(from, newnode, targettype);
|
||||
Node_Copy(from, newnode, func);
|
||||
newnode->implicit = from->implicit;
|
||||
newnode->context = from->context;
|
||||
|
||||
return newnode;
|
||||
}
|
||||
|
@@ -20,7 +20,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.158 2002/09/02 02:13:01 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.159 2002/09/18 21:35:20 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -217,6 +217,15 @@ _equalFunc(Func *a, Func *b)
|
||||
return false;
|
||||
if (a->funcretset != b->funcretset)
|
||||
return false;
|
||||
/*
|
||||
* Special-case COERCE_DONTCARE, so that pathkeys can build coercion
|
||||
* nodes that are equal() to both explicit and implicit coercions.
|
||||
*/
|
||||
if (a->funcformat != b->funcformat &&
|
||||
a->funcformat != COERCE_DONTCARE &&
|
||||
b->funcformat != COERCE_DONTCARE)
|
||||
return false;
|
||||
|
||||
/* Note we do not look at func_fcache; see notes for _equalOper */
|
||||
|
||||
return true;
|
||||
@@ -302,6 +311,14 @@ _equalRelabelType(RelabelType *a, RelabelType *b)
|
||||
return false;
|
||||
if (a->resulttypmod != b->resulttypmod)
|
||||
return false;
|
||||
/*
|
||||
* Special-case COERCE_DONTCARE, so that pathkeys can build coercion
|
||||
* nodes that are equal() to both explicit and implicit coercions.
|
||||
*/
|
||||
if (a->relabelformat != b->relabelformat &&
|
||||
a->relabelformat != COERCE_DONTCARE &&
|
||||
b->relabelformat != COERCE_DONTCARE)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1475,7 +1492,7 @@ _equalCreateCastStmt(CreateCastStmt *a, CreateCastStmt *b)
|
||||
return false;
|
||||
if (!equal(a->func, b->func))
|
||||
return false;
|
||||
if (a->implicit != b->implicit)
|
||||
if (a->context != b->context)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.34 2002/09/04 20:31:19 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.35 2002/09/18 21:35:21 tgl Exp $
|
||||
*/
|
||||
#include "postgres.h"
|
||||
|
||||
@@ -215,13 +215,14 @@ makeAlias(const char *aliasname, List *colnames)
|
||||
* creates a RelabelType node
|
||||
*/
|
||||
RelabelType *
|
||||
makeRelabelType(Node *arg, Oid rtype, int32 rtypmod)
|
||||
makeRelabelType(Node *arg, Oid rtype, int32 rtypmod, CoercionForm rformat)
|
||||
{
|
||||
RelabelType *r = makeNode(RelabelType);
|
||||
|
||||
r->arg = arg;
|
||||
r->resulttype = rtype;
|
||||
r->resulttypmod = rtypmod;
|
||||
r->relabelformat = rformat;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@
|
||||
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.173 2002/09/04 20:31:19 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.174 2002/09/18 21:35:21 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Every (plan) node in POSTGRES has an associated "out" routine which
|
||||
@@ -860,10 +860,11 @@ static void
|
||||
_outFunc(StringInfo str, Func *node)
|
||||
{
|
||||
appendStringInfo(str,
|
||||
" FUNC :funcid %u :funcresulttype %u :funcretset %s ",
|
||||
" FUNC :funcid %u :funcresulttype %u :funcretset %s :funcformat %d ",
|
||||
node->funcid,
|
||||
node->funcresulttype,
|
||||
booltostr(node->funcretset));
|
||||
booltostr(node->funcretset),
|
||||
(int) node->funcformat);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -914,9 +915,11 @@ _outRelabelType(StringInfo str, RelabelType *node)
|
||||
{
|
||||
appendStringInfo(str, " RELABELTYPE :arg ");
|
||||
_outNode(str, node->arg);
|
||||
|
||||
appendStringInfo(str, " :resulttype %u :resulttypmod %d ",
|
||||
node->resulttype, node->resulttypmod);
|
||||
appendStringInfo(str,
|
||||
" :resulttype %u :resulttypmod %d :relabelformat %d ",
|
||||
node->resulttype,
|
||||
node->resulttypmod,
|
||||
(int) node->relabelformat);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.132 2002/09/04 20:31:20 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.133 2002/09/18 21:35:21 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Most of the read functions for plan nodes are tested. (In fact, they
|
||||
@@ -1129,6 +1129,10 @@ _readFunc(void)
|
||||
token = pg_strtok(&length); /* now read it */
|
||||
local_node->funcretset = strtobool(token);
|
||||
|
||||
token = pg_strtok(&length); /* get :funcformat */
|
||||
token = pg_strtok(&length); /* now read it */
|
||||
local_node->funcformat = (CoercionForm) atoi(token);
|
||||
|
||||
local_node->func_fcache = NULL;
|
||||
|
||||
return local_node;
|
||||
@@ -1335,6 +1339,10 @@ _readRelabelType(void)
|
||||
token = pg_strtok(&length); /* get resulttypmod */
|
||||
local_node->resulttypmod = atoi(token);
|
||||
|
||||
token = pg_strtok(&length); /* eat :relabelformat */
|
||||
token = pg_strtok(&length); /* get relabelformat */
|
||||
local_node->relabelformat = (CoercionForm) atoi(token);
|
||||
|
||||
return local_node;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user