|
1 | 1 | <!-- |
2 | | -$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.42 2003/04/15 13:25:08 petere Exp $ |
| 2 | +$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.43 2003/04/19 19:55:37 momjian Exp $ |
3 | 3 | PostgreSQL documentation |
4 | 4 | --> |
5 | 5 |
|
@@ -289,7 +289,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class=" |
289 | 289 | otherwise be taken as row or column delimiters. In particular, the |
290 | 290 | following characters <emphasis>must</> be preceded by a backslash if |
291 | 291 | they appear as part of a column value: backslash itself, |
292 | | - newline, and the current delimiter character. |
| 292 | + newline,carriage return,and the current delimiter character. |
293 | 293 | </para> |
294 | 294 |
|
295 | 295 | <para> |
@@ -355,16 +355,16 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class=" |
355 | 355 | It is strongly recommended that applications generating COPY data convert |
356 | 356 | data newlines and carriage returns to the <literal>\n</> and |
357 | 357 | <literal>\r</> sequences respectively. At present it is |
358 | | - possible to represent a data carriage returnwithout any special quoting, |
359 | | - and to represent a data newline by a backslash and newline.However, |
360 | | - these representationswill not be accepted by default in future releases. |
| 358 | + possible to represent a data carriage returnby a backslash and carriage |
| 359 | +return,and to represent a data newline by a backslash and newline. |
| 360 | +However,these representationsmight not be accepted in future releases. |
361 | 361 | </para> |
362 | 362 |
|
363 | 363 | <para> |
364 | | -Note that the end ofeach rowis marked bya Unix-stylenewline |
365 | | - (<quote><literal>\n</></>). Presently, <command>COPY FROM</command> will not behave as |
366 | | -desired if given a file containing DOS- or Mac-style newlines. |
367 | | -This is expected to change in future releases. |
| 364 | +<command>COPY TO</command> will terminateeach rowwitha Unix-style |
| 365 | +newline(<quote><literal>\n</></>), or carriage return/newline |
| 366 | +("\r\n") on MS Windows. <command>COPY FROM</command> can handle lines |
| 367 | +ending with newlines, carriage returns, or carriage return/newlines. |
368 | 368 | </para> |
369 | 369 | </refsect2> |
370 | 370 |
|
@@ -393,7 +393,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class=" |
393 | 393 | 12-byte sequence <literal>PGBCOPY\n\377\r\n\0</> --- note that the zero byte |
394 | 394 | is a required part of the signature. (The signature is designed to allow |
395 | 395 | easy identification of files that have been munged by a non-8-bit-clean |
396 | | -transfer. This signature will be changed bynewline-translation |
| 396 | +transfer. This signature will be changed byend-of-line-translation |
397 | 397 | filters, dropped zero bytes, dropped high bits, or parity changes.) |
398 | 398 | </para> |
399 | 399 | </listitem> |
|