Add sanity check to ensure delimiter and quote are different in CSV mode

adunstan · adunstan · commit 7284dfe42cb4 · 2007-12-30T14:46:52.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.293 2007/12/27 18:28:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.294 2007/12/30 14:46:52 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -906,6 +906,11 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("COPY quote must be a single ASCII character")));
 
+	if (cstate->csv_mode && cstate->delim[0] == cstate->quote[0])
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("COPY delimiter and quote must be different")));
+
 	/* Check escape */
 	if (!cstate->csv_mode && cstate->escape != NULL)
 		ereport(ERROR,

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.293 2007/12/27 18:28:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.294 2007/12/30 14:46:52 adunstan Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -906,6 +906,11 @@ DoCopy(const CopyStmt stmt, const char queryString)`
`906`	`906`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`907`	`907`	`errmsg("COPY quote must be a single ASCII character")));`
`908`	`908`
	`909`	`+ if (cstate->csv_mode && cstate->delim[0] == cstate->quote[0])`
	`910`	`+ ereport(ERROR,`
	`911`	`+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`912`	`+ errmsg("COPY delimiter and quote must be different")));`
	`913`	`+`
`909`	`914`	`/* Check escape */`
`910`	`915`	`if (!cstate->csv_mode && cstate->escape != NULL)`
`911`	`916`	`ereport(ERROR,`