Prevent doubling of escapes when not in quote mode for CSV.

bmomjian · bmomjian · commit 52e4f27af9b3 · 2004-04-19T21:58:02.000Z
diff --git 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.221 2004/04/19 17:22:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.222 2004/04/19 21:58:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2599,7 +2599,7 @@ CopyAttributeOutCSV(char *server_string, char *delim, char *quote,
 
 	for (; (c = *string) != '\0'; string += mblen)
 	{
-		if (c == quotec || c == escapec)
+		if (need_quote && (c == quotec || c == escapec))
 			CopySendChar(escapec);
 
 		CopySendChar(c);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.221 2004/04/19 17:22:30 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.222 2004/04/19 21:58:02 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2599,7 +2599,7 @@ CopyAttributeOutCSV(char server_string, char delim, char *quote,`
`2599`	`2599`
`2600`	`2600`	`for (; (c = *string) != '\0'; string += mblen)`
`2601`	`2601`	`{`
`2602`		`- if (c == quotec \|\| c == escapec)`
	`2602`	`+ if (need_quote && (c == quotec \|\| c == escapec))`
`2603`	`2603`	`CopySendChar(escapec);`
`2604`	`2604`
`2605`	`2605`	`CopySendChar(c);`