mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify signature of CopyAttributeOutCSV() in copyto.c

Browse Source 
This has come up in 2889fd23be56, reverted later on, and is still useful
on its own to reduce a bit the differences between the code paths
dedicated to CSV and text.

Discussion: https://postgr.es/m/ZcCKwAeFrlOqPBuN@paquier.xyz
This commit is contained in:
Michael Paquier 2024-02-07 12:28:55 +09:00
parent 1aa8324b81
commit b9d6038d70
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/commands/copyto.c
View File

@ -119,7 +119,7 @@ static void ClosePipeToProgram(CopyToState cstate);
static void CopyOneRowTo(CopyToState cstate, TupleTableSlot *slot); static void CopyOneRowTo(CopyToState cstate, TupleTableSlot *slot);
static void CopyAttributeOutText(CopyToState cstate, const char *string); static void CopyAttributeOutText(CopyToState cstate, const char *string);
static void CopyAttributeOutCSV(CopyToState cstate, const char *string, static void CopyAttributeOutCSV(CopyToState cstate, const char *string,
bool use_quote, bool single_attr); bool use_quote);
/* Low-level communications functions */ /* Low-level communications functions */
static void SendCopyBegin(CopyToState cstate); static void SendCopyBegin(CopyToState cstate);
@ -837,8 +837,7 @@ DoCopyTo(CopyToState cstate)
colname = NameStr(TupleDescAttr(tupDesc, attnum - 1)->attname); colname = NameStr(TupleDescAttr(tupDesc, attnum - 1)->attname);
if (cstate->opts.csv_mode) if (cstate->opts.csv_mode)
CopyAttributeOutCSV(cstate, colname, false, CopyAttributeOutCSV(cstate, colname, false);
list_length(cstate->attnumlist) == 1);
else else
CopyAttributeOutText(cstate, colname); CopyAttributeOutText(cstate, colname);
} }
@ -952,8 +951,7 @@ CopyOneRowTo(CopyToState cstate, TupleTableSlot *slot)
value); value);
if (cstate->opts.csv_mode) if (cstate->opts.csv_mode)
CopyAttributeOutCSV(cstate, string, CopyAttributeOutCSV(cstate, string,
cstate->opts.force_quote_flags[attnum - 1], cstate->opts.force_quote_flags[attnum - 1]);
list_length(cstate->attnumlist) == 1);
else else
CopyAttributeOutText(cstate, string); CopyAttributeOutText(cstate, string);
} }
@ -1139,7 +1137,7 @@ CopyAttributeOutText(CopyToState cstate, const char *string)
*/ */
static void static void
CopyAttributeOutCSV(CopyToState cstate, const char *string, CopyAttributeOutCSV(CopyToState cstate, const char *string,
bool use_quote, bool single_attr) bool use_quote)
{ {
const char *ptr; const char *ptr;
const char *start; const char *start;
@ -1147,6 +1145,7 @@ CopyAttributeOutCSV(CopyToState cstate, const char *string,
char delimc = cstate->opts.delim[0]; char delimc = cstate->opts.delim[0];
char quotec = cstate->opts.quote[0]; char quotec = cstate->opts.quote[0];
char escapec = cstate->opts.escape[0]; char escapec = cstate->opts.escape[0];
bool single_attr = (list_length(cstate->attnumlist) == 1);
/* force quoting if it matches null_print (before conversion!) */ /* force quoting if it matches null_print (before conversion!) */
if (!use_quote && strcmp(string, cstate->opts.null_print) == 0) if (!use_quote && strcmp(string, cstate->opts.null_print) == 0)