Skip to content

P
Postgres FD Implementation
Commit 7980b8a5 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Fix for inclusion of new prompt output.

parent 1eae8e12
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
src/bin/psql/psql.c
View file @ 7980b8a5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.36 1996/11/30 03:41:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.37 1996/12/01 20:28:39 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#endif #endif
#endif #endif
#define PROMPT "=> "
#define MAX_QUERY_BUFFER 20000 #define MAX_QUERY_BUFFER 20000
#define COPYBUFSIZ 8192 #define COPYBUFSIZ 8192
...@@ -789,7 +791,7 @@ do_connect(const char *new_dbname, PsqlSettings * settings) ...@@ -789,7 +791,7 @@ do_connect(const char *new_dbname, PsqlSettings * settings)
PQfinish(olddb); PQfinish(olddb);
free(settings->prompt); free(settings->prompt);
settings->prompt = malloc(strlen(PQdb(settings->db)) + 10); settings->prompt = malloc(strlen(PQdb(settings->db)) + 10);
sprintf(settings->prompt, "%s=> ", PQdb(settings->db)); sprintf(settings->prompt, "%s%s ", PQdb(settings->db), PROMPT);
} }
} }
} }
...@@ -1243,7 +1245,6 @@ MainLoop(PsqlSettings * settings, FILE * source) ...@@ -1243,7 +1245,6 @@ MainLoop(PsqlSettings * settings, FILE * source)
char *query_start; char *query_start;
interactive = ((source == stdin) && !settings->notty); interactive = ((source == stdin) && !settings->notty);
#define PROMPT "=> "
if (interactive) { if (interactive) {
if (settings->prompt) if (settings->prompt)
free(settings->prompt); free(settings->prompt);
...@@ -1272,13 +1273,14 @@ MainLoop(PsqlSettings * settings, FILE * source) ...@@ -1272,13 +1273,14 @@ MainLoop(PsqlSettings * settings, FILE * source)
line = strdup(query); line = strdup(query);
query[0] = '\0'; query[0] = '\0';
} else { } else {
sprintf(settings->prompt, "%s%s", PQdb(settings->db), PROMPT); if (interactive && !settings->quiet) {
if (in_quote) if (in_quote)
settings->prompt[strlen(settings->prompt)-3] = '\''; settings->prompt[strlen(settings->prompt)-3] = '\'';
else if (query[0] != '\0' && !querySent) else if (query[0] != '\0' && !querySent)
settings->prompt[strlen(settings->prompt)-3] = '-'; settings->prompt[strlen(settings->prompt)-3] = '-';
else else
settings->prompt[strlen(settings->prompt)-3] = '='; settings->prompt[strlen(settings->prompt)-3] = '=';
}
line = GetNextLine(settings->prompt, source); line = GetNextLine(settings->prompt, source);
if (interactive && settings->useReadline && line != NULL) if (interactive && settings->useReadline && line != NULL)
add_history(line); /* save non-empty lines in history */ add_history(line); /* save non-empty lines in history */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment