NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commita5b7640

committed

Fix concat_ws() to not insert a separator after leading NULL argument(s).

Per bug #6181 from Itagaki Takahiro. Also do some marginal code cleanupand improve error handling.

1 parentbe1e805 commita5b7640Copy full SHA for a5b7640

File tree

1 file changed

+23

-11

lines changed

src/backend/utils/adt
- varlena.c

1 file changed

+23

-11

lines changed

`‎src/backend/utils/adt/varlena.c‎`

Lines changed: 23 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -3622,11 +3622,19 @@ string_agg_finalfn(PG_FUNCTION_ARGS)`
`3622`	`3622`	`PG_RETURN_NULL();`
`3623`	`3623`	`}`
`3624`	`3624`
	`3625`	`+/*`
	`3626`	`+ * Implementation of both concat() and concat_ws().`
	`3627`	`+ *`
	`3628`	`+ * sepstr/seplen describe the separator. argidx is the first argument`
	`3629`	`+ * to concatenate (counting from zero).`
	`3630`	`+ */`
`3625`	`3631`	`statictext*`
`3626`		`-concat_internal(constchar*sepstr,intseplen,intargidx,FunctionCallInfofcinfo)`
	`3632`	`+concat_internal(constchar*sepstr,intseplen,intargidx,`
	`3633`	`+FunctionCallInfofcinfo)`
`3627`	`3634`	`{`
`3628`		`-StringInfoDatastr;`
`3629`	`3635`	`text*result;`
	`3636`	`+StringInfoDatastr;`
	`3637`	`+boolfirst_arg= true;`
`3630`	`3638`	`inti;`
`3631`	`3639`
`3632`	`3640`	`initStringInfo(&str);`
`@@ -3635,17 +3643,21 @@ concat_internal(const char *sepstr, int seplen, int argidx, FunctionCallInfo fci`
`3635`	`3643`	`{`
`3636`	`3644`	`if (!PG_ARGISNULL(i))`
`3637`	`3645`	`{`
	`3646`	`+Datumvalue=PG_GETARG_DATUM(i);`
`3638`	`3647`	`Oidvaltype;`
`3639`		`-Datumvalue;`
`3640`	`3648`	`OidtypOutput;`
`3641`	`3649`	`booltypIsVarlena;`
`3642`	`3650`
`3643`		`-if (i>argidx)`
	`3651`	`+/* add separator if appropriate */`
	`3652`	`+if (first_arg)`
	`3653`	`+first_arg= false;`
	`3654`	`+else`
`3644`	`3655`	`appendBinaryStringInfo(&str,sepstr,seplen);`
`3645`	`3656`
`3646`		`-/* append n-th value */`
`3647`		`-value=PG_GETARG_DATUM(i);`
	`3657`	`+/* call the appropriate type output function, append the result */`
`3648`	`3658`	`valtype=get_fn_expr_argtype(fcinfo->flinfo,i);`
	`3659`	`+if (!OidIsValid(valtype))`
	`3660`	`+elog(ERROR,"could not determine data type of concat() input");`
`3649`	`3661`	`getTypeOutputInfo(valtype,&typOutput,&typIsVarlena);`
`3650`	`3662`	`appendStringInfoString(&str,`
`3651`	`3663`	`OidOutputFunctionCall(typOutput,value));`
`@@ -3664,12 +3676,12 @@ concat_internal(const char *sepstr, int seplen, int argidx, FunctionCallInfo fci`
`3664`	`3676`	`Datum`
`3665`	`3677`	`text_concat(PG_FUNCTION_ARGS)`
`3666`	`3678`	`{`
`3667`		`-PG_RETURN_TEXT_P(concat_internal(NULL,0,0,fcinfo));`
	`3679`	`+PG_RETURN_TEXT_P(concat_internal("",0,0,fcinfo));`
`3668`	`3680`	`}`
`3669`	`3681`
`3670`	`3682`	`/*`
`3671`		`- * Concatenate all but first argumentvalues with separators. The first`
`3672`		`- * parameter is used asa separator. NULL arguments are ignored.`
	`3683`	`+ * Concatenate all but first argumentvalue with separators. The first`
	`3684`	`+ * parameter is used asthe separator. NULL arguments are ignored.`
`3673`	`3685`	`*/`
`3674`	`3686`	`Datum`
`3675`	`3687`	`text_concat_ws(PG_FUNCTION_ARGS)`
`@@ -3682,8 +3694,8 @@ text_concat_ws(PG_FUNCTION_ARGS)`
`3682`	`3694`
`3683`	`3695`	`sep=PG_GETARG_TEXT_PP(0);`
`3684`	`3696`
`3685`		`-PG_RETURN_TEXT_P(concat_internal(`
`3686`		`-VARDATA_ANY(sep),VARSIZE_ANY_EXHDR(sep),1,fcinfo));`
	`3697`	`+PG_RETURN_TEXT_P(concat_internal(VARDATA_ANY(sep),VARSIZE_ANY_EXHDR(sep),`
	`3698`	`+1,fcinfo));`
`3687`	`3699`	`}`
`3688`	`3700`
`3689`	`3701`	`/*`

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!

Commita5b7640

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/varlena.c‎`

0 commit comments