[PATCH]: ./psql-copy-var-3.patch

Author: Commitfest Bot

doc/src/sgml/ref/psql-ref.sgml

@@ -1172,10 +1172,13 @@ SELECT $1 \parse stmt1
         <tip>
         <para>
         Another way to obtain the same result as <literal>\copy
-        ... to</literal> is to use the <acronym>SQL</acronym> <literal>COPY
-        ... TO STDOUT</literal> command and terminate it
-        with <literal>\g <replaceable>filename</replaceable></literal>
-        or <literal>\g |<replaceable>program</replaceable></literal>.
+        ... to</literal> or <literal>from</literal> is to use the <acronym>SQL</acronym>
+        <literal>COPY ... TO STDOUT</literal> or <literal>FROM STDIN</literal>
+        command and terminate it with either
+        <literal>\g <replaceable>filename</replaceable></literal>
+        or <literal>\g |<replaceable>program</replaceable></literal> for output
+        and <literal>\gi <replaceable>filename</replaceable></literal>
+        or <literal>\gi <replaceable>program</replaceable>|</literal> for input.
         Unlike <literal>\copy</literal>, this method allows the command to
         span multiple lines; also, variable interpolation and backquote
         expansion can be used.
@@ -1188,7 +1191,7 @@ SELECT $1 \parse stmt1
         <command>COPY</command> command with a file or program data source or
         destination, because all data must pass through the client/server
         connection.  For large amounts of data the <acronym>SQL</acronym>
-        command might be preferable.
+        command might be preferable if data are available on the server.
         </para>
         </tip>
 
@@ -2558,6 +2561,28 @@ CREATE INDEX
       </varlistentry>
 
 
+      <varlistentry id="app-psql-meta-command-gi">
+        <term><literal>\gi <replaceable class="parameter">file</replaceable></literal></term>
+        <term><literal>\gi <replaceable class="parameter">command</replaceable>|</literal></term>
+        <listitem>
+        <para>
+        Sends the current query buffer to the server and uses the provided
+        <replaceable>file</replaceable> contents or <replaceable>command</replaceable>
+        output as input.
+        This should only apply to <acronym>SQL</acronym>
+        <link linkend="sql-copy"><command>COPY</command></link>
+        which seeks an input when used with <literal>FROM STDIN</literal>, and
+        will simply result in the command simple execution for other commands
+        which do not need an input stream.
+        </para>
+        <para>
+        This approach should be prefered to using <literal>\copy</literal>
+        as it achieves the same result but can span several lines and
+        is subject to variable interpolation and backquote expansion.
+        </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="app-psql-meta-command-gset">
         <term><literal>\gset [ <replaceable class="parameter">prefix</replaceable> ]</literal></term>
 

src/bin/psql/command.c

@@ -107,6 +107,7 @@ static backslashResult exec_command_getenv(PsqlScanState scan_state, bool active
 										   const char *cmd);
 static backslashResult exec_command_gexec(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_getresults(PsqlScanState scan_state, bool active_branch);
+static backslashResult exec_command_gi(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_gset(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_help(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_html(PsqlScanState scan_state, bool active_branch);
@@ -380,6 +381,8 @@ exec_command(const char *cmd,
 		status = exec_command_getresults(scan_state, active_branch);
 	else if (strcmp(cmd, "gexec") == 0)
 		status = exec_command_gexec(scan_state, active_branch);
+	else if (strcmp(cmd, "gi") == 0)
+		status = exec_command_gi(scan_state, active_branch);
 	else if (strcmp(cmd, "gset") == 0)
 		status = exec_command_gset(scan_state, active_branch);
 	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
@@ -1750,7 +1753,8 @@ exec_command_g(PsqlScanState scan_state, bool active_branch, const char *cmd)
 		else
 		{
 			expand_tilde(&fname);
-			pset.gfname = pg_strdup(fname);
+			pset.g_pipe = fname[0] == '|';
+			pset.gfname = pg_strdup(fname + (pset.g_pipe ? 1 : 0));
 		}
 		if (strcmp(cmd, "gx") == 0)
 		{
@@ -1957,6 +1961,56 @@ exec_command_gexec(PsqlScanState scan_state, bool active_branch)
 	return status;
 }
 
+/*
+ * \gi filename/shell-command
+ *
+ * Send the current query with a query input from the filename or pipe
+ * command.
+ */
+static backslashResult
+exec_command_gi(PsqlScanState scan_state, bool active_branch)
+{
+	backslashResult status = PSQL_CMD_SKIP_LINE;
+
+	if (active_branch)
+	{
+		char	   *fname;
+		int			last;
+
+		fname = psql_scan_slash_option(scan_state, OT_FILEPIPE, NULL, false);
+
+		if (fname == NULL)
+		{
+			pg_log_error("\\gi expects a filename or pipe command");
+			clean_extended_state();
+			free(fname);
+			return PSQL_CMD_ERROR;
+		}
+
+		/* check and truncate final pipe character */
+		last = strlen(fname) - 1;
+		pset.gi_pipe = last >= 0 && fname[last] == '|';
+		if (pset.gi_pipe)
+			fname[last] = '\0';
+
+		if (PQpipelineStatus(pset.db) != PQ_PIPELINE_OFF)
+		{
+			pg_log_error("\\gi not allowed in pipeline mode");
+			clean_extended_state();
+			free(fname);
+			return PSQL_CMD_ERROR;
+		}
+
+		expand_tilde(&fname);
+		pset.gi_fname = pg_strdup(fname);
+
+		status = PSQL_CMD_SEND;
+		free(fname);
+	}
+
+	return status;
+}
+
 /*
  * \gset [prefix] -- send query and store result into variables
  */
@@ -2440,9 +2494,10 @@ exec_command_out(PsqlScanState scan_state, bool active_branch)
 	{
 		char	   *fname = psql_scan_slash_option(scan_state,
 												   OT_FILEPIPE, NULL, true);
+		bool		is_pipe = *fname == '|';
 
 		expand_tilde(&fname);
-		success = setQFout(fname);
+		success = setQFout(fname + (is_pipe ? 1 : 0), is_pipe);
 		free(fname);
 	}
 	else