diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/copy.c | 15 | ||||
| -rw-r--r-- | src/bin/psql/copy.c | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index eb3af9798d1..b41da6385db 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.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,6 +722,7 @@ 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; @@ -729,8 +730,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString) 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 index 57593d111c1..01fe0f6c84d 100644 --- 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. |