mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update docs/error message for CSV quote/escape --- must be ASCII.

Browse Source 
Backpatch doc change to 8.2.X.
This commit is contained in:
Bruce Momjian 2007-04-18 02:28:22 +00:00
parent 4029a5af9b
commit c228448910
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/ref/copy.sgml
View File

@ -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 PostgreSQL documentation
--> -->
@ -225,7 +225,7 @@ COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable c
<term><replaceable class="parameter">quote</replaceable></term> <term><replaceable class="parameter">quote</replaceable></term>
<listitem> <listitem>
<para> <para>
Specifies the quotation character in <literal>CSV</> mode. Specifies the ASCII quotation character in <literal>CSV</> mode.
The default is double-quote. The default is double-quote.
</para> </para>
</listitem> </listitem>
@ -235,7 +235,7 @@ COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable c
<term><replaceable class="parameter">escape</replaceable></term> <term><replaceable class="parameter">escape</replaceable></term>
<listitem> <listitem>
<para> <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. <literal>QUOTE</> data character value in <literal>CSV</> mode.
The default is the <literal>QUOTE</> value (usually double-quote). The default is the <literal>QUOTE</> value (usually double-quote).
</para> </para>

6
src/backend/commands/copy.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) if (cstate->csv_mode && strlen(cstate->quote) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("COPY quote must be a single character"))); errmsg("COPY quote must be a single ASCII character")));
/* Check escape */ /* Check escape */
if (!cstate->csv_mode && cstate->escape != NULL) 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) if (cstate->csv_mode && strlen(cstate->escape) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (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 */ /* Check force_quote */
if (!cstate->csv_mode && force_quote != NIL) if (!cstate->csv_mode && force_quote != NIL)