From c2284489106f6d2d0a9a2d2b84fe0baadab97ed4 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 18 Apr 2007 02:28:22 +0000
Subject: [PATCH] Update docs/error message for CSV quote/escape --- must be
ASCII. Backpatch doc change to 8.2.X.
---
doc/src/sgml/ref/copy.sgml | 6 +++---
src/backend/commands/copy.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 0140ea28aeb..703951de803 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.79 2007/04/18 00:17:56 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.80 2007/04/18 02:28:22 momjian Exp $
PostgreSQL documentation
-->
@@ -225,7 +225,7 @@ COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable c
<term><replaceable class="parameter">quote</replaceable></term>
<listitem>
<para>
- Specifies the quotation character in <literal>CSV</> mode.
+ Specifies the ASCII quotation character in <literal>CSV</> mode.
The default is double-quote.
</para>
</listitem>
@@ -235,7 +235,7 @@ COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable c
<term><replaceable class="parameter">escape</replaceable></term>
<listitem>
<para>
- Specifies the character that should appear before a
+ Specifies the ASCII character that should appear before a
<literal>QUOTE</> data character value in <literal>CSV</> mode.
The default is the <literal>QUOTE</> value (usually double-quote).
</para>
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 193a50251ff..be33bb76c4f 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.281 2007/04/18 00:38:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.282 2007/04/18 02:28:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -893,7 +893,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
if (cstate->csv_mode && strlen(cstate->quote) != 1)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("COPY quote must be a single character")));
+ errmsg("COPY quote must be a single ASCII character")));
/* Check escape */
if (!cstate->csv_mode && cstate->escape != NULL)
@@ -904,7 +904,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
if (cstate->csv_mode && strlen(cstate->escape) != 1)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("COPY escape must be a single character")));
+ errmsg("COPY escape must be a single ASCII character")));
/* Check force_quote */
if (!cstate->csv_mode && force_quote != NIL)
--
GitLab