Code review for FORCE QUOTE * patch: fix error checking to consider FORCE

tglsfdc · tglsfdc · commit a07e5acebbc0 · 2009-07-25T17:04:19.000Z
QUOTE * as a variety of FORCE QUOTE, and update psql documentation to include
the option.  (The actual psql code doesn't seem to need any changes.)
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.226 2009/07/24 19:35:44 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.227 2009/07/25 17:04:19 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -774,7 +774,7 @@ testdb=&gt;
               [ header ]
               [ quote [ as ] '<replaceable class="parameter">character</replaceable>' ]
               [ escape [ as ] '<replaceable class="parameter">character</replaceable>' ]
-              [ force quote <replaceable class="parameter">column_list</replaceable> ]
+              [ force quote <replaceable class="parameter">column_list</replaceable> | * ]
               [ force not null <replaceable class="parameter">column_list</replaceable> ] ]</literal>
         </term>
 
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.314 2009/07/25 13:35:32 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.315 2009/07/25 17:04:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -722,15 +722,15 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
 	List	   *attnamelist = stmt->attlist;
 	List	   *force_quote = NIL;
 	List	   *force_notnull = NIL;
+	bool		force_quote_all = false;
 	AclMode		required_access = (is_from ? ACL_INSERT : ACL_SELECT);
 	AclMode		relPerms;
 	AclMode		remainingPerms;
 	ListCell   *option;
 	TupleDesc	tupDesc;
 	int			num_phys_attrs;
 	uint64		processed;
-	bool		force_quote_all = false;
-	
+
 	/* Allocate workspace and zero all fields */
 	cstate = (CopyStateData *) palloc0(sizeof(CopyStateData));
 
@@ -805,12 +805,11 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
 		}
 		else if (strcmp(defel->defname, "force_quote") == 0)
 		{
-			if (force_quote)
+			if (force_quote || force_quote_all)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("conflicting or redundant options")));
-
-			if (IsA(defel->arg, A_Star))
+			if (defel->arg && IsA(defel->arg, A_Star))
 				force_quote_all = true;
 			else
 				force_quote = (List *) defel->arg;
@@ -930,11 +929,11 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
 				 errmsg("COPY escape must be a single one-byte character")));
 
 	/* Check force_quote */
-	if (!cstate->csv_mode && force_quote != NIL)
+	if (!cstate->csv_mode && (force_quote != NIL || force_quote_all))
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("COPY force quote available only in CSV mode")));
-	if (force_quote != NIL && is_from)
+	if ((force_quote != NIL || force_quote_all) && is_from)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("COPY force quote only available using COPY TO")));
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.80 2009/04/26 15:31:50 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.81 2009/07/25 17:04:19 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "copy.h"
@@ -35,12 +35,12 @@
  *	\copy tablename [(columnlist)] from|to filename
  *	  [ with ] [ binary ] [ oids ] [ delimiter [as] char ] [ null [as] string ]
  *	  [ csv  [ header ] [ quote [ AS ] string ]  escape [as] string
- *		[ force not null column [, ...] | force quote column [, ...] ] ]
+ *		[ force not null column [, ...] | force quote column [, ...] | * ] ]
  *
  *	\copy ( select stmt ) to filename
  *	  [ with ] [ binary ] [ delimiter [as] char ] [ null [as] string ]
  *	  [ csv  [ header ] [ quote [ AS ] string ]  escape [as] string
- *		[ force quote column [, ...] ] ]
+ *		[ force quote column [, ...] | * ] ]
  *
  * Force quote only applies for copy to; force not null only applies for
  * copy from.

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.80 2009/04/26 15:31:50 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.81 2009/07/25 17:04:19 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "copy.h"`
`@@ -35,12 +35,12 @@`
`35`	`35`	`* \copy tablename [(columnlist)] from\|to filename`
`36`	`36`	`* [ with ] [ binary ] [ oids ] [ delimiter [as] char ] [ null [as] string ]`
`37`	`37`	`* [ csv [ header ] [ quote [ AS ] string ] escape [as] string`
`38`		`- * [ force not null column [, ...] \| force quote column [, ...] ] ]`
	`38`	`+ * [ force not null column [, ...] \| force quote column [, ...] \| * ] ]`
`39`	`39`	`*`
`40`	`40`	`* \copy ( select stmt ) to filename`
`41`	`41`	`* [ with ] [ binary ] [ delimiter [as] char ] [ null [as] string ]`
`42`	`42`	`* [ csv [ header ] [ quote [ AS ] string ] escape [as] string`
`43`		`- * [ force quote column [, ...] ] ]`
	`43`	`+ * [ force quote column [, ...] \| * ] ]`
`44`	`44`	`*`
`45`	`45`	`* Force quote only applies for copy to; force not null only applies for`
`46`	`46`	`* copy from.`