diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 50ea0c910e..2e17c0310a 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -705,7 +705,7 @@ testdb=> \copy table [ ( column_list ) ] { from | to } - filename | stdin | stdout + { filename | stdin | stdout | - } [ with ] [ oids ] [ delimiter [as] 'character' ] @@ -720,26 +720,41 @@ testdb=> reading or writing the specified file, psql reads or writes the file and routes the data between the server and the local file system. - This means that file accessibility and privileges are those - of the local user, not the server, and no SQL superuser - privileges are required. + This means that file accessibility and privileges are those of + the local user, not the server, and no SQL superuser + privileges are required. The syntax of the command is similar to that of the - SQL COPY command. (See its - description for the details.) Note that, because of this, + SQL command. Note that, because of this, special parsing rules apply to the \copy command. In particular, the variable substitution rules and backslash escapes do not apply. + + For \copy table from filename operations, + psql adds the option of using a + hyphen instead of filename. This causes + \copy to read rows from the same source that + issued the command, continuing until \. is + read or the stream reaches EOF. This option is + useful for populating tables in-line within a SQL script file. + In contrast, \copy from stdin always reads from + psql's standard input. + + This operation is not as efficient as the SQL COPY command because all data must pass through the client/server connection. For large - amounts of data the other technique may be preferable. + amounts of data the SQL command may be preferable. @@ -747,11 +762,12 @@ testdb=> Note the difference in interpretation of stdin and stdout between - client and server copies: in a client copy these always + \copy and COPY. + In \copy these always refer to psql's input and output - stream. On a server copy stdin comes from - wherever the COPY itself came from (for - example, a script run with the option), and + streams. In COPY, stdin comes + from wherever the COPY itself came from (for + example, a script run with the option), while stdout refers to the query output stream (see \o meta-command below). diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 1e113ac49a..ed3649dfe1 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.79 2004/01/09 21:12:20 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.80 2004/01/20 23:48:56 tgl Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -513,12 +513,7 @@ ProcessCopyResult(PGresult *results) break; case PGRES_COPY_IN: - if (pset.cur_cmd_interactive && !QUIET()) - puts(gettext("Enter data to be copied followed by a newline.\n" - "End with a backslash and a period on a line by itself.")); - - success = handleCopyIn(pset.db, pset.cur_cmd_source, - pset.cur_cmd_interactive ? get_prompt(PROMPT_COPY) : NULL); + success = handleCopyIn(pset.db, pset.cur_cmd_source); break; default: diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c index 36937d2606..e852dd5b7a 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.36 2004/01/09 21:12:20 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.37 2004/01/20 23:48:56 tgl Exp $ */ #include "postgres_fe.h" #include "copy.h" @@ -23,6 +23,7 @@ #include "settings.h" #include "common.h" +#include "prompt.h" #include "stringutils.h" #ifdef WIN32 @@ -53,6 +54,7 @@ struct copy_options char *table; char *column_list; char *file; /* NULL = stdin/stdout */ + bool in_dash; /* true = use src stream not true stdin */ bool from; bool binary; bool oids; @@ -218,10 +220,25 @@ parse_slash_copy(const char *args) if (strcasecmp(token, "stdin") == 0 || strcasecmp(token, "stdout") == 0) + { + result->in_dash = false; result->file = NULL; + } + else if (strcmp(token, "-") == 0) + { + /* Can't do this on output */ + if (!result->from) + goto error; + + result->in_dash = true; + result->file = NULL; + } else + { + result->in_dash = false; result->file = xstrdup(token); - expand_tilde(&result->file); + expand_tilde(&result->file); + } token = strtokx(NULL, whitespace, NULL, NULL, 0, false, pset.encoding); @@ -362,8 +379,10 @@ do_copy(const char *args) { if (options->file) copystream = fopen(options->file, "r"); + else if (options->in_dash) + copystream = pset.cur_cmd_source; else - copystream = stdin; + copystream = stdin; } else { @@ -401,7 +420,7 @@ do_copy(const char *args) success = handleCopyOut(pset.db, copystream); break; case PGRES_COPY_IN: - success = handleCopyIn(pset.db, copystream, NULL); + success = handleCopyIn(pset.db, copystream); break; case PGRES_NONFATAL_ERROR: case PGRES_FATAL_ERROR: @@ -416,7 +435,7 @@ do_copy(const char *args) PQclear(result); - if (copystream != stdout && copystream != stdin) + if (options->file != NULL) fclose(copystream); free_copy_options(options); return success; @@ -486,13 +505,12 @@ handleCopyOut(PGconn *conn, FILE *copystream) * conn should be a database connection that you just called COPY FROM on * (and which gave you PGRES_COPY_IN back); * copystream is the file stream you want the input to come from - * prompt is something to display to request user input (only makes sense - * if stdin is an interactive tty) */ bool -handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt) +handleCopyIn(PGconn *conn, FILE *copystream) { + const char *prompt; bool copydone = false; bool firstload; bool linedone; @@ -503,10 +521,17 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt) int ret; unsigned int linecount = 0; - if (prompt) /* disable prompt if not interactive */ + /* Prompt if interactive input */ + if (isatty(fileno(copystream))) { - if (!isatty(fileno(copystream))) - prompt = NULL; + if (!QUIET()) + puts(gettext("Enter data to be copied followed by a newline.\n" + "End with a backslash and a period on a line by itself.")); + prompt = get_prompt(PROMPT_COPY); + } + else + { + prompt = NULL; } while (!copydone) diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h index 0f6a688796..8daf4a2609 100644 --- a/src/bin/psql/copy.h +++ b/src/bin/psql/copy.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/copy.h,v 1.14 2003/11/29 19:52:06 pgsql Exp $ + * $PostgreSQL: pgsql/src/bin/psql/copy.h,v 1.15 2004/01/20 23:48:56 tgl Exp $ */ #ifndef COPY_H #define COPY_H @@ -17,6 +17,6 @@ bool do_copy(const char *args); /* lower level processors for copy in/out streams */ bool handleCopyOut(PGconn *conn, FILE *copystream); -bool handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt); +bool handleCopyIn(PGconn *conn, FILE *copystream); #endif