From: David Fetter <david@fetter.org>
To: Fabien COELHO <coelho@cri.ensmp.fr>
Cc: Corey Huinker <corey.huinker@gmail.com>
Cc: PostgreSQL Development <pgsql-hackers@postgresql.org>
Subject: Re: [PATCH v1] Add \echo_stderr to psql
Date: Mon, 22 Apr 2019 15:45:32 +0200
Message-ID: <20190422134532.GV28936@fetter.org> (raw)
In-Reply-To: <alpine.DEB.2.21.1904220902530.29102@lancre>
References: <20190421183115.GA4311@fetter.org>
<alpine.DEB.2.21.1904212128260.29102@lancre>
<CADkLM=fvwxuuKEUNWcN5wD2ifOKfo-phqYYeC=RFy5W2guf1_g@mail.gmail.com>
<alpine.DEB.2.21.1904220902530.29102@lancre>
On Mon, Apr 22, 2019 at 09:04:08AM +0200, Fabien COELHO wrote:
>
> Hello Corey,
>
> > > \warn ...
> > > \warning ...
> >
> > These two seem about the best to me, drawing from the perl warn command.
>
> Yep, I was thinking of perl & gmake. Maybe the 4 letter option is better
> because its the same length as "echo".
>
> > I suppose we could go the bash &2 route here, but I don't want to.
>
> I agree on this one.
Please find attached v2, name is now \warn.
How might we test this portably?
Best,
David.
--
David Fetter <david(at)fetter(dot)org> http://fetter.org/
Phone: +1 415 235 3778
Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donateAttachments:
[text/x-diff] v2-0001-Add-warn-to-psql.patch (4.2K, ../20190422134532.GV28936@fetter.org/2-v2-0001-Add-warn-to-psql.patch)
download | inline diff:
From db987e21d0e25ce306d5482fa78d71de8454f1aa Mon Sep 17 00:00:00 2001
From: David Fetter <david@fetter.org>
Date: Sun, 21 Apr 2019 11:08:40 -0700
Subject: [PATCH v2] Add \warn to psql
To: hackers
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------2.20.1"
This is a multi-part message in MIME format.
--------------2.20.1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
- Does what it says on the label- Do we have any way to test this?diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgmlindex b86764003d..4edf8e67a1 100644--- a/doc/src/sgml/ref/psql-ref.sgml+++ b/doc/src/sgml/ref/psql-ref.sgml@@ -1879,6 +1879,26 @@ Tue Oct 26 21:40:57 CEST 1999
</listitem>
</varlistentry>
+ <varlistentry>+ <term><literal>\warn <replaceable class="parameter">text</replaceable> [ ... ]</literal></term>+ <listitem>+ <para>+ Prints the arguments to the standard error, separated by one+ space and followed by a newline. This can be useful to+ intersperse information in the output of scripts when not polluting+ standard output is desired. For example:++<programlisting>+=> <userinput>\echo :variable</userinput>+=> <userinput>\warn `date`</userinput>+Sun Apr 21 10:48:11 PDT 2019+</programlisting>+ If the first argument is an unquoted <literal>-n</literal> the trailing+ newline is not written.+ </para>+ </listitem>+ </varlistentry>+
<varlistentry>
<term><literal>\ef <optional> <replaceable class="parameter">function_description</replaceable> <optional> <replaceable class="parameter">line_number</replaceable> </optional> </optional> </literal></term>
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.cindex 8254d61099..9425f02005 100644--- a/src/bin/psql/command.c+++ b/src/bin/psql/command.c@@ -319,7 +319,7 @@ exec_command(const char *cmd,
status = exec_command_ef_ev(scan_state, active_branch, query_buf, true);
else if (strcmp(cmd, "ev") == 0)
status = exec_command_ef_ev(scan_state, active_branch, query_buf, false);
- else if (strcmp(cmd, "echo") == 0 || strcmp(cmd, "qecho") == 0)+ else if (strcmp(cmd, "echo") == 0 || strcmp(cmd, "warn") == 0 || strcmp(cmd, "qecho") == 0)
status = exec_command_echo(scan_state, active_branch, cmd);
else if (strcmp(cmd, "elif") == 0)
status = exec_command_elif(scan_state, cstack, query_buf);
@@ -1114,7 +1114,7 @@ exec_command_ef_ev(PsqlScanState scan_state, bool active_branch,
}
/*
- * \echo and \qecho -- echo arguments to stdout or query output+ * \echo, \warn and \qecho -- echo arguments to stdout or query output
*/
static backslashResult
exec_command_echo(PsqlScanState scan_state, bool active_branch, const char *cmd)
@@ -1129,6 +1129,8 @@ exec_command_echo(PsqlScanState scan_state, bool active_branch, const char *cmd)
if (strcmp(cmd, "qecho") == 0)
fout = pset.queryFout;
+ else if (strcmp(cmd, "warn") == 0)+ fout = stderr;
else
fout = stdout;
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.cindex d6d41b51d5..2ecb8b73c1 100644--- a/src/bin/psql/help.c+++ b/src/bin/psql/help.c@@ -207,6 +207,7 @@ slashUsage(unsigned short int pager)
fprintf(output, _("Input/Output\n"));
fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
+ fprintf(output, _(" \\warn [STRING] write string to standard error\n"));
fprintf(output, _(" \\i FILE execute commands from file\n"));
fprintf(output, _(" \\ir FILE as \\i, but relative to location of current script\n"));
fprintf(output, _(" \\o [FILE] send all query results to file or |pipe\n"));
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.cindex bcddc7601e..383a17a7f4 100644--- a/src/bin/psql/tab-complete.c+++ b/src/bin/psql/tab-complete.c@@ -1421,7 +1421,7 @@ psql_completion(const char *text, int start, int end)
"\\t", "\\T", "\\timing",
"\\unset",
"\\x",
- "\\w", "\\watch",+ "\\w","\\warn", "\\watch",
"\\z",
"\\!", "\\?",
NULL
--------------2.20.1--
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: david@fetter.org, coelho@cri.ensmp.fr, corey.huinker@gmail.com
Subject: Re: [PATCH v1] Add \echo_stderr to psql
In-Reply-To: <20190422134532.GV28936@fetter.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox