|
8 | 8 | *
|
9 | 9 | *
|
10 | 10 | * IDENTIFICATION
|
11 |
| - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.313 2009/07/2500:07:11 adunstan Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.314 2009/07/2513:35:32 adunstan Exp $ |
12 | 12 | *
|
13 | 13 | *-------------------------------------------------------------------------
|
14 | 14 | */
|
@@ -729,9 +729,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
|
729 | 729 | TupleDesctupDesc;
|
730 | 730 | intnum_phys_attrs;
|
731 | 731 | uint64processed;
|
732 |
| - |
733 |
| -/* a dummy list that represents 'all-columns' */ |
734 |
| -Listall_columns= {T_List }; |
| 732 | +boolforce_quote_all= false; |
735 | 733 |
|
736 | 734 | /* Allocate workspace and zero all fields */
|
737 | 735 | cstate= (CopyStateData*)palloc0(sizeof(CopyStateData));
|
@@ -813,7 +811,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
|
813 | 811 | errmsg("conflicting or redundant options")));
|
814 | 812 |
|
815 | 813 | if (IsA(defel->arg,A_Star))
|
816 |
| -force_quote=&all_columns; |
| 814 | +force_quote_all=true; |
817 | 815 | else
|
818 | 816 | force_quote= (List*)defel->arg;
|
819 | 817 | }
|
@@ -1099,7 +1097,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString)
|
1099 | 1097 |
|
1100 | 1098 | /* Convert FORCE QUOTE name list to per-column flags, check validity */
|
1101 | 1099 | cstate->force_quote_flags= (bool*)palloc0(num_phys_attrs*sizeof(bool));
|
1102 |
| -if (force_quote==&all_columns) |
| 1100 | +if (force_quote_all) |
1103 | 1101 | {
|
1104 | 1102 | inti;
|
1105 | 1103 |
|
|