NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb9d6038

committed

Simplify signature of CopyAttributeOutCSV() in copyto.c

This has come up in2889fd2, reverted later on, and is still usefulon its own to reduce a bit the differences between the code pathsdedicated to CSV and text.Discussion:https://postgr.es/m/ZcCKwAeFrlOqPBuN@paquier.xyz

1 parent1aa8324 commitb9d6038Copy full SHA for b9d6038

File tree

1 file changed

-6

lines changed

src/backend/commands
- copyto.c

1 file changed

-6

lines changed

`‎src/backend/commands/copyto.c`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static void ClosePipeToProgram(CopyToState cstate);`
`119`	`119`	`staticvoidCopyOneRowTo(CopyToStatecstate,TupleTableSlot*slot);`
`120`	`120`	`staticvoidCopyAttributeOutText(CopyToStatecstate,constchar*string);`
`121`	`121`	`staticvoidCopyAttributeOutCSV(CopyToStatecstate,constchar*string,`
`122`		`-booluse_quote,boolsingle_attr);`
	`122`	`+booluse_quote);`
`123`	`123`
`124`	`124`	`/* Low-level communications functions */`
`125`	`125`	`staticvoidSendCopyBegin(CopyToStatecstate);`
`@@ -837,8 +837,7 @@ DoCopyTo(CopyToState cstate)`
`837`	`837`	`colname=NameStr(TupleDescAttr(tupDesc,attnum-1)->attname);`
`838`	`838`
`839`	`839`	`if (cstate->opts.csv_mode)`
`840`		`-CopyAttributeOutCSV(cstate,colname, false,`
`841`		`-list_length(cstate->attnumlist)==1);`
	`840`	`+CopyAttributeOutCSV(cstate,colname, false);`
`842`	`841`	`else`
`843`	`842`	`CopyAttributeOutText(cstate,colname);`
`844`	`843`	`}`
`@@ -952,8 +951,7 @@ CopyOneRowTo(CopyToState cstate, TupleTableSlot *slot)`
`952`	`951`	`value);`
`953`	`952`	`if (cstate->opts.csv_mode)`
`954`	`953`	`CopyAttributeOutCSV(cstate,string,`
`955`		`-cstate->opts.force_quote_flags[attnum-1],`
`956`		`-list_length(cstate->attnumlist)==1);`
	`954`	`+cstate->opts.force_quote_flags[attnum-1]);`
`957`	`955`	`else`
`958`	`956`	`CopyAttributeOutText(cstate,string);`
`959`	`957`	`}`
`@@ -1139,14 +1137,15 @@ CopyAttributeOutText(CopyToState cstate, const char *string)`
`1139`	`1137`	`*/`
`1140`	`1138`	`staticvoid`
`1141`	`1139`	`CopyAttributeOutCSV(CopyToStatecstate,constchar*string,`
`1142`		`-booluse_quote,boolsingle_attr)`
	`1140`	`+booluse_quote)`
`1143`	`1141`	`{`
`1144`	`1142`	`constchar*ptr;`
`1145`	`1143`	`constchar*start;`
`1146`	`1144`	`charc;`
`1147`	`1145`	`chardelimc=cstate->opts.delim[0];`
`1148`	`1146`	`charquotec=cstate->opts.quote[0];`
`1149`	`1147`	`charescapec=cstate->opts.escape[0];`
	`1148`	`+boolsingle_attr= (list_length(cstate->attnumlist)==1);`
`1150`	`1149`
`1151`	`1150`	`/* force quoting if it matches null_print (before conversion!) */`
`1152`	`1151`	`if (!use_quote&&strcmp(string,cstate->opts.null_print)==0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb9d6038

File tree

1 file changed

1 file changed

`‎src/backend/commands/copyto.c`

0 commit comments