diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-27 17:00:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-27 17:00:56 +0000 |
| commit | f1d1ca9a2663b04c956dcb1b617d18d10d1f9890 (patch) | |
| tree | f7053eb03ac7eb3d435b87607c5ba43fe1c44d9d /src/backend/commands/copy.c | |
| parent | 16adaf1b80013bee8d68ea994d95769be95a8548 (diff) | |
| download | postgresql-f1d1ca9a2663b04c956dcb1b617d18d10d1f9890.tar.gz postgresql-f1d1ca9a2663b04c956dcb1b617d18d10d1f9890.zip | |
Fix ill-advised usage of x?y:z expressions in errmsg() and errhint() calls.
This prevented gettext from recognizing the strings that need to be
translated.
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index a1aefcaad84..ea90608c435 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.291 2007/12/27 16:45:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.292 2007/12/27 17:00:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2420,12 +2420,12 @@ CopyReadLineText(CopyState cstate) if (cstate->eol_type == EOL_CRNL) ereport(ERROR, (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), - errmsg(!cstate->csv_mode ? - "literal carriage return found in data" : - "unquoted carriage return found in data"), - errhint(!cstate->csv_mode ? - "Use \"\\r\" to represent carriage return." : - "Use quoted CSV field to represent carriage return."))); + !cstate->csv_mode ? + errmsg("literal carriage return found in data") : + errmsg("unquoted carriage return found in data"), + !cstate->csv_mode ? + errhint("Use \"\\r\" to represent carriage return.") : + errhint("Use quoted CSV field to represent carriage return."))); /* * if we got here, it is the first line and we didn't find @@ -2437,12 +2437,12 @@ CopyReadLineText(CopyState cstate) else if (cstate->eol_type == EOL_NL) ereport(ERROR, (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), - errmsg(!cstate->csv_mode ? - "literal carriage return found in data" : - "unquoted carriage return found in data"), - errhint(!cstate->csv_mode ? - "Use \"\\r\" to represent carriage return." : - "Use quoted CSV field to represent carriage return."))); + !cstate->csv_mode ? + errmsg("literal carriage return found in data") : + errmsg("unquoted carriage return found in data"), + !cstate->csv_mode ? + errhint("Use \"\\r\" to represent carriage return.") : + errhint("Use quoted CSV field to represent carriage return."))); /* If reach here, we have found the line terminator */ break; } @@ -2453,12 +2453,12 @@ CopyReadLineText(CopyState cstate) if (cstate->eol_type == EOL_CR || cstate->eol_type == EOL_CRNL) ereport(ERROR, (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), - errmsg(!cstate->csv_mode ? - "literal newline found in data" : - "unquoted newline found in data"), - errhint(!cstate->csv_mode ? - "Use \"\\n\" to represent newline." : - "Use quoted CSV field to represent newline."))); + !cstate->csv_mode ? + errmsg("literal newline found in data") : + errmsg("unquoted newline found in data"), + !cstate->csv_mode ? + errhint("Use \"\\n\" to represent newline.") : + errhint("Use quoted CSV field to represent newline."))); cstate->eol_type = EOL_NL; /* in case not set yet */ /* If reach here, we have found the line terminator */ break; |