[tarantool-patches] Re: [PATCH v4 8/8] sql: remove sqlErrorMsg()

["n.pettik" <korablev@tarantool.org>]

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]


> diff --git a/src/box/sql/select.c b/src/box/sql/select.c
> index e217c19..778de2c 100644
> --- a/src/box/sql/select.c
> +++ b/src/box/sql/select.c
> @@ -1466,25 +1466,25 @@ sql_expr_list_to_key_info(struct Parse *parse, struct ExprList *list, int start)
> /*
>  * Name of the connection operator, used for error messages.
>  */
> -static const char *
> -selectOpName(int id)
> +const char *
> +select_op_name(int op_id)

Add sql_ prefix.

> {
> -	char *z;
> -	switch (id) {
> +	const char *op_name;

IMHO don’t see much sense in this renaming: function is small and straight
enough to use old brief names.

> +	switch (op_id) {
> 	case TK_ALL:
> -		z = "UNION ALL";
> +		op_name = "UNION ALL";
> 		break;
> 	case TK_INTERSECT:
> -		z = "INTERSECT";
> +		op_name = "INTERSECT";
> 		break;
> 	case TK_EXCEPT:
> -		z = "EXCEPT";
> +		op_name = "EXCEPT";
> 		break;
> 	default:
> -		z = "UNION";
> +		op_name = "UNION";
> 		break;
> 	}
> -	return z;
> +	return op_name;
> }


[-- Attachment #2: Type: text/html, Size: 45535 bytes --]