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

Have psql command 'help' suggest the use of \?, updated version.

Browse Source 
Greg Sabino Mullane
This commit is contained in:
Bruce Momjian
2008-04-04 18:00:25 +00:00
parent dc565af454
commit b6f0ad4b0e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/psql/help.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.125 2008/04/04 17:42:43 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.126 2008/04/04 18:00:25 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -188,7 +188,6 @@ slashUsage(unsigned short int pager)
ON(pset.timing)); ON(pset.timing));
fprintf(output, _(" \\unset NAME unset (delete) internal variable\n")); fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));
fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n")); fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));
fprintf(output, _(" \\? display this help output\n"));
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, _("Query Buffer\n")); fprintf(output, _("Query Buffer\n"));

10
src/bin/psql/mainloop.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.88 2008/04/04 17:42:43 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.89 2008/04/04 18:00:25 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "mainloop.h" #include "mainloop.h"
@ -11,7 +11,6 @@
#include "command.h" #include "command.h"
#include "common.h" #include "common.h"
#include "help.h"
#include "input.h" #include "input.h"
#include "settings.h" #include "settings.h"
@ -172,13 +171,16 @@ MainLoop(FILE *source)
continue; continue;
} }
/* A request for help? Be friendly and show them the slash way of doing things */ /* A request for help? Be friendly and give them some guidance */
if (pset.cur_cmd_interactive && query_buf->len == 0 && if (pset.cur_cmd_interactive && query_buf->len == 0 &&
pg_strncasecmp(line, "help", 4) == 0 && pg_strncasecmp(line, "help", 4) == 0 &&
(line[4] == '\0' || line[4] == ';' || isspace(line[4]))) (line[4] == '\0' || line[4] == ';' || isspace(line[4])))
{ {
free(line); free(line);
slashUsage(pset.popt.topt.pager); puts("You are using psql, the command-line interface to PostgreSQL.");
puts("Enter SQL commands, or type \\? for a list of backslash options.");
puts("Use \\h for SQL command help.");
puts("Use \\q to quit.");
continue; continue;
} }