database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Use psql_error() for most psql error calls, per request from Magnus.

Browse Source
This commit is contained in:
Bruce Momjian
2012-08-25 22:58:42 -04:00
parent f6752ee59a
commit 9e9a5b71d5
4 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/psql/command.c
View File

@ -110,7 +110,7 @@ HandleSlashCmds(PsqlScanState scan_state,
if (status == PSQL_CMD_UNKNOWN)
{
if (pset.cur_cmd_interactive)
fprintf(stderr, _("Invalid command \\%s. Try \\? for help.\n"), cmd);
psql_error("Invalid command \\%s. Try \\? for help.\n", cmd);
else
psql_error("invalid command \\%s\n", cmd);
status = PSQL_CMD_ERROR;
@ -904,7 +904,7 @@ exec_command(const char *cmd,
if (strcmp(pw1, pw2) != 0)
{
fprintf(stderr, _("Passwords didn't match.\n"));
psql_error("Passwords didn't match.\n");
success = false;
}
else
@ -922,7 +922,7 @@ exec_command(const char *cmd,
if (!encrypted_password)
{
fprintf(stderr, _("Password encryption failed.\n"));
psql_error("Password encryption failed.\n");
success = false;
}
else
@ -1441,7 +1441,7 @@ exec_command(const char *cmd,
while ((value = psql_scan_slash_option(scan_state,
OT_NORMAL, NULL, true)))
{
fprintf(stderr, "+ opt(%d) = |%s|\n", i++, value);
psql_error("+ opt(%d) = |%s|\n", i++, value);
free(value);
}
}
@ -1519,7 +1519,8 @@ do_connect(char *dbname, char *user, char *host, char *port)
* to connect to the wrong database by using defaults, so require
* all parameters to be specified.
*/
fputs(_("All connection parameters must be supplied because no database connection exists\n"), stderr);
psql_error("All connection parameters must be supplied because no "
"database connection exists\n");
return false;
}
@ -1608,7 +1609,7 @@ do_connect(char *dbname, char *user, char *host, char *port)
/* pset.db is left unmodified */
if (o_conn)
fputs(_("Previous connection kept\n"), stderr);
psql_error("Previous connection kept\n");
}
else
{