Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 96193aa

Browse files
committed
More replacements of binary compatible to binary coercible.
1 parent c96439b commit 96193aa

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/backend/commands/functioncmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.94 2008/07/11 07:02:43 petere Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.95 2008/07/12 10:44:56 petere Exp $
1414
*
1515
* DESCRIPTION
1616
* These routines take the parse tree and pick out the
@@ -1407,7 +1407,7 @@ CreateCast(CreateCastStmt *stmt)
14071407
if (!IsBinaryCoercible(sourcetypeid, procstruct->proargtypes.values[0]))
14081408
ereport(ERROR,
14091409
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
1410-
errmsg("argument of cast function must match or be binary-compatible with source data type")));
1410+
errmsg("argument of cast function must match or be binary-coercible from source data type")));
14111411
if (nargs > 1 && procstruct->proargtypes.values[1] != INT4OID)
14121412
ereport(ERROR,
14131413
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -1419,7 +1419,7 @@ CreateCast(CreateCastStmt *stmt)
14191419
if (!IsBinaryCoercible(procstruct->prorettype, targettypeid))
14201420
ereport(ERROR,
14211421
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
1422-
errmsg("return data type of cast function must match or be binary-compatible with target data type")));
1422+
errmsg("return data type of cast function must match or be binary-coercible to target data type")));
14231423

14241424
/*
14251425
* Restricting the volatility of a cast function may or may not be a

src/bin/psql/describe.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
1010
*
11-
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.175 2008/07/03 15:59:55 petere Exp $
11+
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.176 2008/07/12 10:44:56 petere Exp $
1212
*/
1313
#include "postgres_fe.h"
1414

@@ -2002,14 +2002,14 @@ listCasts(const char *pattern)
20022002
initPQExpBuffer(&buf);
20032003
/*
20042004
* We need left join here for binary casts. Also note that we don't
2005-
* attempt to localize '(binary compatible)', because there's too much
2005+
* attempt to localize '(binary coercible)', because there's too much
20062006
* risk of gettext translating a function name that happens to match
20072007
* some string in the PO database.
20082008
*/
20092009
printfPQExpBuffer(&buf,
20102010
"SELECT pg_catalog.format_type(castsource, NULL) AS \"%s\",\n"
20112011
" pg_catalog.format_type(casttarget, NULL) AS \"%s\",\n"
2012-
" CASE WHEN castfunc = 0 THEN '(binary compatible)'\n"
2012+
" CASE WHEN castfunc = 0 THEN '(binary coercible)'\n"
20132013
" ELSE p.proname\n"
20142014
" END as \"%s\",\n"
20152015
" CASE WHEN c.castcontext = 'e' THEN '%s'\n"

0 commit comments

Comments
 (0)