More replacements of binary compatible to binary coercible.

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index abb2e6eca887140e3ee49f0559fce6dd206948be..9831692eea0a4fa82b54f2202fdbae63ce23459c 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.94 2008/07/11 07:02:43 petere Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.95 2008/07/12 10:44:56 petere Exp $
  *
  * DESCRIPTION
  *       These routines take the parse tree and pick out the
@@ -1407,7 +1407,7 @@ CreateCast(CreateCastStmt *stmt)
                if (!IsBinaryCoercible(sourcetypeid, procstruct->proargtypes.values[0]))
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                       errmsg("argument of cast function must match or be binary-compatible with source data type")));
+                       errmsg("argument of cast function must match or be binary-coercible from source data type")));
                if (nargs > 1 && procstruct->proargtypes.values[1] != INT4OID)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -1419,7 +1419,7 @@ CreateCast(CreateCastStmt *stmt)
                if (!IsBinaryCoercible(procstruct->prorettype, targettypeid))
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                        errmsg("return data type of cast function must match or be binary-compatible with target data type")));
+                                        errmsg("return data type of cast function must match or be binary-coercible to target data type")));
 
                /*
                 * Restricting the volatility of a cast function may or may not be a

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index b571db9fd81c8577937e788cdf6566fa8960d2f1..1e13bc351141095e73eacafc89e3392f9b64a6fb 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.175 2008/07/03 15:59:55 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.176 2008/07/12 10:44:56 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -2002,14 +2002,14 @@ listCasts(const char *pattern)
        initPQExpBuffer(&buf);
        /*
         * We need left join here for binary casts.  Also note that we don't
-        * attempt to localize '(binary compatible)', because there's too much
+        * attempt to localize '(binary coercible)', because there's too much
         * risk of gettext translating a function name that happens to match
         * some string in the PO database.
         */
        printfPQExpBuffer(&buf,
                           "SELECT pg_catalog.format_type(castsource, NULL) AS \"%s\",\n"
                           "       pg_catalog.format_type(casttarget, NULL) AS \"%s\",\n"
-                                         "       CASE WHEN castfunc = 0 THEN '(binary compatible)'\n"
+                                         "       CASE WHEN castfunc = 0 THEN '(binary coercible)'\n"
                                          "            ELSE p.proname\n"
                                          "       END as \"%s\",\n"
                                          "       CASE WHEN c.castcontext = 'e' THEN '%s'\n"