On Fri, Mar 05, 2021 at 01:30:11PM +0900, Fujii Masao wrote:
> if ((env = getenv("PGDATABASE")) != NULL && *env != '\0')
> dbName = env;
> - else if (login != NULL && *login != '\0')
> - dbName = login;
> + else if ((env = getenv("PGUSER")) != NULL && *env != '\0')
> + dbName = env;
> else
> - dbName = "";
> + dbName = get_user_name_or_exit(progname);
>
> If dbName is set by libpq, the above also is not necessary?If you remove this part, pgbench loses some log information if PQconnectdbParams() returns NULL, like on OOM if the database name is NULL. Perhaps that's not worth caring about here for a single log failure, but that's the reason is why I left this part around. Now, simplifying the code is one goal of this patch, so I would not mind shaving a bit more of it :) -- Michael
signature.asc
Description: PGP signature
