mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Change error messages to oids come out as %u and not %d. Change has no
real affect now.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.11 1999/02/21 03:49:03 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.12 1999/05/10 00:45:26 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -42,8 +42,8 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
|
||||
Datum val;
|
||||
|
||||
#ifdef PARSEDEBUG
|
||||
printf("coerce_type: argument types are %d -> %d\n",
|
||||
inputTypeId, targetTypeId);
|
||||
printf("coerce_type: argument types are %d -> %u\n",
|
||||
inputTypeId, targetTypeId);
|
||||
#endif
|
||||
|
||||
if (targetTypeId == InvalidOid)
|
||||
@@ -129,7 +129,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
|
||||
else
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("coerce_type: argument type IDs %d match\n", inputTypeId);
|
||||
printf("coerce_type: argument type IDs %u match\n", inputTypeId);
|
||||
#endif
|
||||
|
||||
result = node;
|
||||
@@ -165,7 +165,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
|
||||
for (i = 0; i < nargs; i++)
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("can_coerce_type: argument #%d types are %d -> %d\n",
|
||||
printf("can_coerce_type: argument #%d types are %u -> %u\n",
|
||||
i, input_typeids[i], func_typeids[i]);
|
||||
#endif
|
||||
if (input_typeids[i] != func_typeids[i])
|
||||
@@ -187,7 +187,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
|
||||
else if (func_typeids[i] == InvalidOid)
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("can_coerce_type: output OID func_typeids[%d] is zero\n", i);
|
||||
printf("can_coerce_type: output OID func_typeids[%u] is zero\n", i);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
@@ -196,7 +196,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
|
||||
else if (input_typeids[i] == InvalidOid)
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("can_coerce_type: input OID input_typeids[%d] is zero\n", i);
|
||||
printf("can_coerce_type: input OID input_typeids[%u] is zero\n", i);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
@@ -243,7 +243,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
|
||||
else
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("can_coerce_type: argument #%d type is %d (UNKNOWN)\n",
|
||||
printf("can_coerce_type: argument #%d type is %u (UNKNOWN)\n",
|
||||
i, input_typeids[i]);
|
||||
#endif
|
||||
}
|
||||
@@ -266,7 +266,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
|
||||
else
|
||||
{
|
||||
#ifdef PARSEDEBUG
|
||||
printf("can_coerce_type: argument #%d type IDs %d match\n",
|
||||
printf("can_coerce_type: argument #%d type IDs %u match\n",
|
||||
i, input_typeids[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.42 1999/03/16 20:15:06 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.43 1999/05/10 00:45:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -651,7 +651,7 @@ funcid_get_rettype(Oid funcid)
|
||||
0, 0, 0);
|
||||
|
||||
if (!HeapTupleIsValid(func_tuple))
|
||||
elog(ERROR, "Function OID %d does not exist", funcid);
|
||||
elog(ERROR, "Function OID %u does not exist", funcid);
|
||||
|
||||
funcrettype = (Oid)
|
||||
((Form_pg_proc) GETSTRUCT(func_tuple))->prorettype;
|
||||
@@ -1183,7 +1183,7 @@ find_inheritors(Oid relid, Oid **supervec)
|
||||
|
||||
/* save the type id, rather than the relation id */
|
||||
if ((rd = heap_open(qentry->sqe_relid)) == (Relation) NULL)
|
||||
elog(ERROR, "Relid %d does not exist", qentry->sqe_relid);
|
||||
elog(ERROR, "Relid %u does not exist", qentry->sqe_relid);
|
||||
qentry->sqe_relid = typeTypeId(typenameType(RelationGetRelationName(rd)->data));
|
||||
heap_close(rd);
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.24 1999/02/13 23:17:09 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.25 1999/05/10 00:45:28 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -256,7 +256,7 @@ make_array_ref(Node *expr,
|
||||
0, 0, 0);
|
||||
|
||||
if (!HeapTupleIsValid(type_tuple))
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
|
||||
typearray);
|
||||
|
||||
/* get the array type struct from the type tuple */
|
||||
@@ -271,7 +271,7 @@ make_array_ref(Node *expr,
|
||||
ObjectIdGetDatum(type_struct_array->typelem),
|
||||
0, 0, 0);
|
||||
if (!HeapTupleIsValid(type_tuple))
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
|
||||
typearray);
|
||||
|
||||
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
|
||||
@@ -338,7 +338,7 @@ make_array_set(Expr *target_expr,
|
||||
0, 0, 0);
|
||||
|
||||
if (!HeapTupleIsValid(type_tuple))
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
|
||||
typearray);
|
||||
|
||||
/* get the array type struct from the type tuple */
|
||||
@@ -353,7 +353,7 @@ make_array_set(Expr *target_expr,
|
||||
0, 0, 0);
|
||||
|
||||
if (!HeapTupleIsValid(type_tuple))
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
|
||||
elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
|
||||
typearray);
|
||||
|
||||
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.23 1998/12/13 23:54:40 thomas Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.24 1999/05/10 00:45:29 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -631,7 +631,7 @@ right_oper(char *op, Oid arg)
|
||||
ncandidates = unary_oper_get_candidates(op, arg, &candidates, 'r');
|
||||
if (ncandidates == 0)
|
||||
{
|
||||
elog(ERROR, "Can't find right op '%s' for type %d", op, arg);
|
||||
elog(ERROR, "Can't find right op '%s' for type %u", op, arg);
|
||||
return NULL;
|
||||
}
|
||||
else if (ncandidates == 1)
|
||||
@@ -693,7 +693,7 @@ left_oper(char *op, Oid arg)
|
||||
ncandidates = unary_oper_get_candidates(op, arg, &candidates, 'l');
|
||||
if (ncandidates == 0)
|
||||
{
|
||||
elog(ERROR, "Can't find left op '%s' for type %d", op, arg);
|
||||
elog(ERROR, "Can't find left op '%s' for type %u", op, arg);
|
||||
return NULL;
|
||||
}
|
||||
else if (ncandidates == 1)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.19 1999/02/23 07:53:01 thomas Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.20 1999/05/10 00:45:29 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -231,7 +231,7 @@ GetArrayElementType(Oid typearray)
|
||||
0, 0, 0);
|
||||
|
||||
if (!HeapTupleIsValid(type_tuple))
|
||||
elog(ERROR, "GetArrayElementType: Cache lookup failed for type %d",
|
||||
elog(ERROR, "GetArrayElementType: Cache lookup failed for type %u",
|
||||
typearray);
|
||||
|
||||
/* get the array type struct from the type tuple */
|
||||
|
||||
Reference in New Issue
Block a user