proposal - assign result of query to psql variable

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 8abadb2..2e8309d 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -748,6 +748,29 @@ exec_command(const char *cmd,
 		status = PSQL_CMD_SEND;
 	}
 
+	/* \gset send query and store result */
+	else if (strcmp(cmd, "gset") == 0)
+	{
+		bool	error;
+
+		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+
+		if (!pset.gvars)
+		{
+			psql_error("\\%s: missing required argument\n", cmd);
+			status = PSQL_CMD_NOSEND;
+		}
+		else if (error)
+		{
+			psql_error("\\%s: syntax error\n", cmd);
+			status = PSQL_CMD_NOSEND;
+			tglist_free(pset.gvars);
+			pset.gvars = NULL;
+		}
+		else
+			status = PSQL_CMD_SEND;
+	}
+
 	/* help */
 	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
 	{
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index f0bcea0..57cbe23 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -16,6 +16,7 @@ typedef enum _backslashResult
 {
 	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
 	PSQL_CMD_SEND,				/* query complete; send off */
+	PSQL_CMD_NOSEND,			/* query complete, don't send */
 	PSQL_CMD_SKIP_LINE,			/* keep building query */
 	PSQL_CMD_TERMINATE,			/* quit program */
 	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 330d5ce..5248721 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -826,6 +826,103 @@ PrintQueryResults(PGresult *results)
 	return success;
 }
 
+/*
+ * StoreQueryResult: store first row of result to selected variables
+ *
+ * Note: Utility function for use by SendQuery() only.
+ *
+ * Returns true if the query executed sucessfully, false otherwise.
+ */
+static bool
+StoreQueryResult(PGresult *result)
+{
+	bool success;
+
+	switch (PQresultStatus(result))
+	{
+		case PGRES_TUPLES_OK:
+			{
+				int	i;
+
+				if (PQntuples(result) < 1)
+				{
+					psql_error("no data found\n");
+					success = false;
+				}
+				else if (PQntuples(result) > 1)
+				{
+					psql_error("too many rows\n");
+					success = false;
+				}
+				else
+				{
+					TargetListData *iter = (TargetListData *) pset.gvars;
+
+					success = true;
+
+					for (i = 0; i < PQnfields(result); i++)
+					{
+						if (!iter)
+						{
+							psql_error("to few target variables\n");
+							success = false;
+							break;
+						}
+
+						if (iter->name)
+						{
+							if (!SetVariable(pset.vars, iter->name,
+										   PQgetvalue(result, 0, i)))
+							{
+								psql_error("invalid variable name: \"%s\"",
+													iter->name);
+								success = false;
+								break;
+							}
+						}
+
+						iter = iter->next;
+					}
+
+					if (success && iter != NULL)
+					{
+						psql_error("too many target variables\n");
+						success = false;
+					}
+				}
+			}
+			break;
+
+		case PGRES_COMMAND_OK:
+		case PGRES_EMPTY_QUERY:
+			psql_error("no data found\n");
+			success = false;
+			break;
+
+		case PGRES_COPY_OUT:
+		case PGRES_COPY_IN:
+			psql_error("COPY isnot supported by \\gset command\n");
+			success = false;
+			break;
+
+		case PGRES_BAD_RESPONSE:
+		case PGRES_NONFATAL_ERROR:
+		case PGRES_FATAL_ERROR:
+			success = false;
+			break;
+
+		default:
+			success = false;
+			psql_error("unexpected PQresultStatus: %d\n",
+					   PQresultStatus(result));
+			break;
+	}
+
+	tglist_free(pset.gvars);
+	pset.gvars = NULL;
+
+	return success;
+}
 
 /*
  * SendQuery: send the query string to the backend
@@ -953,7 +1050,12 @@ SendQuery(const char *query)
 
 		/* but printing results isn't: */
 		if (OK && results)
-			OK = PrintQueryResults(results);
+		{
+			if (pset.gvars)
+				OK = StoreQueryResult(results);
+			else
+				OK = PrintQueryResults(results);
+		}
 	}
 	else
 	{
@@ -1668,3 +1770,53 @@ expand_tilde(char **filename)
 
 	return *filename;
 }
+
+
+/*
+ * Add name of internal variable to query targer list
+ *
+ */
+TargetList
+tglist_add(TargetList tglist, const char *name)
+{
+	TargetListData		*tgf;
+
+	tgf = pg_malloc(sizeof(TargetListData));
+	tgf->name = name ? pg_strdup(name) : NULL;
+	tgf->next = NULL;
+
+	if (tglist)
+	{
+		TargetListData *iter = (TargetListData *) tglist;
+
+		while (iter->next)
+			iter = iter->next;
+
+		iter->next = tgf;
+
+		return tglist;
+	}
+	else
+		return (TargetList) tgf;
+}
+
+/*
+ * Release target list
+ *
+ */
+void
+tglist_free(TargetList tglist)
+{
+	TargetListData *iter = (TargetListData *) tglist;
+
+	while (iter)
+	{
+		TargetListData *next = iter->next;
+
+		if (iter->name)
+			free(iter->name);
+
+		free(iter);
+		iter = next;
+	}
+}
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 8037cbc..f955fec 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -21,6 +21,14 @@
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
 
+typedef struct _target_field
+{
+	char	   *name;
+	struct _target_field *next;
+} TargetListData;
+
+typedef struct TargetListData *TargetList;
+
 /*
  * Safer versions of some standard C library functions. If an
  * out-of-memory condition occurs, these functions will bail out
@@ -63,4 +71,7 @@ extern const char *session_username(void);
 
 extern char *expand_tilde(char **filename);
 
+extern TargetList  tglist_add(TargetList tglist, const char *name);
+extern void tglist_free(TargetList tglist);
+
 #endif   /* COMMON_H */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 3ebf7cc..0f34f41 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -162,13 +162,14 @@ slashUsage(unsigned short int pager)
 {
 	FILE	   *output;
 
-	output = PageOutput(94, pager);
+	output = PageOutput(95, pager);
 
 	/* if you add/remove a line here, change the row count above */
 
 	fprintf(output, _("General\n"));
 	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
 	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
 	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
 	fprintf(output, _("  \\q                     quit psql\n"));
 	fprintf(output, "\n");
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 16c65ec..33faff8 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -327,6 +327,14 @@ MainLoop(FILE *source)
 					/* flush any paren nesting info after forced send */
 					psql_scan_reset(scan_state);
 				}
+				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+				{
+					resetPQExpBuffer(query_buf);
+					/* reset parsing state since we are rescanning whole line */
+					psql_scan_reset(scan_state);
+					line_saved_in_history = true;
+					success = false;
+				}
 				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
 				{
 					/* rescan query_buf as new input */
diff --git a/src/bin/psql/psqlscan.h b/src/bin/psql/psqlscan.h
index 0b5ef0c..742de7f 100644
--- a/src/bin/psql/psqlscan.h
+++ b/src/bin/psql/psqlscan.h
@@ -8,6 +8,7 @@
 #ifndef PSQLSCAN_H
 #define PSQLSCAN_H
 
+#include "common.h"
 #include "pqexpbuffer.h"
 
 #include "prompt.h"
@@ -33,7 +34,8 @@ enum slash_option_type
 	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
 	OT_FILEPIPE,				/* it's a filename or pipe */
 	OT_WHOLE_LINE,				/* just snarf the rest of the line */
-	OT_NO_EVAL					/* no expansion of backticks or variables */
+	OT_NO_EVAL,					/* no expansion of backticks or variables */
+	OT_VARLIST				/* returns variable's identifier or comma */
 };
 
 
@@ -59,6 +61,10 @@ extern char *psql_scan_slash_option(PsqlScanState state,
 					   char *quote,
 					   bool semicolon);
 
+extern TargetList psql_scan_slash_vars(PsqlScanState state,
+							bool *error);
+
+
 extern void psql_scan_slash_command_end(PsqlScanState state);
 
 #endif   /* PSQLSCAN_H */
diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 1208c8f..15018af 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -106,13 +106,18 @@ static char *option_quote;
 static int	unquoted_option_chars;
 static int	backtick_start_offset;
 
+TargetList gvars;
+
 
 /* Return values from yylex() */
 #define LEXRES_EOL			0	/* end of input */
 #define LEXRES_SEMI			1	/* command-terminating semicolon found */
-#define LEXRES_BACKSLASH	2	/* backslash command start */
-#define LEXRES_OK			3	/* OK completion of backslash argument */
-
+#define LEXRES_COMMA			2
+#define LEXRES_BACKSLASH	3	/* backslash command start */
+#define LEXRES_IDENT			4	/* valid internal variable identifier */
+#define LEXRES_OK			5	/* OK completion of backslash argument */
+#define LEXRES_ERROR			6
+#define LEXRES_NONE			7
 
 int	yylex(void);
 
@@ -167,6 +172,7 @@ static void escape_variable(bool as_ident);
  *  <xdolq> $foo$ quoted strings
  *  <xui> quoted identifier with Unicode escapes
  *  <xus> quoted string with Unicode escapes
+ *  <xvl> comma separated list of variables
  *
  * Note: we intentionally don't mimic the backend's <xeu> state; we have
  * no need to distinguish it from <xe> state, and no good way to get out
@@ -183,6 +189,7 @@ static void escape_variable(bool as_ident);
 %x xdolq
 %x xui
 %x xus
+%x xvl
 /* Additional exclusive states for psql only: lex backslash commands */
 %x xslashcmd
 %x xslashargstart
@@ -628,6 +635,26 @@ other			.
 					ECHO;
 				}
 
+<xvl>{
+
+{identifier}	{
+					gvars = tglist_add(gvars, yytext);
+					return LEXRES_IDENT;
+				}
+
+","		{
+					return LEXRES_COMMA;
+				}
+
+{horiz_space}+	{ }
+
+. |
+\n		{
+					return LEXRES_ERROR;
+				}
+
+}
+
 {xufailed}	{
 					/* throw back all but the initial u/U */
 					yyless(1);
@@ -1449,6 +1476,75 @@ psql_scan_slash_command(PsqlScanState state)
 }
 
 /*
+ * returns identifier from identifier list
+ *
+ *    when comma_expected is true, when we require comma before identifier
+ *    error is true, when unexpected char was identified or missing
+ *        comma.
+ *
+ */
+TargetList
+psql_scan_slash_vars(PsqlScanState state,
+						bool *error)
+{
+	PQExpBufferData mybuf;
+	int			lexresult = LEXRES_NONE;
+	int		lexresult_prev;
+	bool	is_lexer_error = false;
+
+
+	/* Must be scanning already */
+	psql_assert(state->scanbufhandle);
+
+	/* Set up static variables that will be used by yylex */
+	cur_state = state;
+	output_buf = &mybuf;
+
+	if (state->buffer_stack != NULL)
+		yy_switch_to_buffer(state->buffer_stack->buf);
+	else
+		yy_switch_to_buffer(state->scanbufhandle);
+
+	gvars = NULL;
+
+	do
+	{
+		lexresult_prev = lexresult;
+
+		BEGIN(xvl);
+		lexresult = yylex();
+
+		/* read to end */
+		if (is_lexer_error)
+			continue;
+
+		if (lexresult == LEXRES_ERROR)
+		{
+			is_lexer_error = true;
+			continue;
+		}
+
+		if (lexresult_prev == LEXRES_IDENT && lexresult == LEXRES_IDENT)
+		{
+			is_lexer_error = true;
+			continue;
+		}
+
+		if (!is_lexer_error && (lexresult_prev == LEXRES_COMMA || lexresult_prev == LEXRES_NONE) 
+				&& lexresult == LEXRES_COMMA)
+			gvars = tglist_add(gvars, NULL);
+
+	} while (lexresult != LEXRES_EOL);
+
+	if (!is_lexer_error && lexresult_prev == LEXRES_COMMA)
+		gvars = tglist_add(gvars, NULL);
+
+	*error = is_lexer_error;
+
+	return gvars;
+}
+
+/*
  * Parse off the next argument for a backslash command, and return it as a
  * malloc'd string.  If there are no more arguments, returns NULL.
  *
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index c907fa0..e3381b2 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -9,6 +9,7 @@
 #define SETTINGS_H
 
 
+#include "common.h"
 #include "variables.h"
 #include "print.h"
 
@@ -73,6 +74,7 @@ typedef struct _psqlSettings
 	printQueryOpt popt;
 
 	char	   *gfname;			/* one-shot file output argument for \g */
+	TargetList  gvars;			/* one-shot target list argument for \gset */
 
 	bool		notty;			/* stdin or stdout is not a tty (as determined
 								 * on startup) */
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index a1bb230..b47a44a 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -811,7 +811,7 @@ psql_completion(char *text, int start, int end)
 		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
 		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
 		"\\e", "\\echo", "\\ef", "\\encoding",
-		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
+		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
 		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
 		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
 		"\\set", "\\sf", "\\t", "\\T",

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1489,1495 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
          <literal>\r</> to cancel.
          </para>
  
--- 1489,1495 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or <literal>\gset</literal> to send it, or
          <literal>\r</> to cancel.
          </para>
  
***************
*** 1623,1628 **** Tue Oct 26 21:40:57 CEST 1999
--- 1623,1640 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+         Sends the current query input buffer to the server and stores
+         the query's target list a corresponding list of psql
+         variables.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 826,831 **** PrintQueryResults(PGresult *results)
--- 826,928 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed sucessfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("to few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"",
+ 													iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY isnot supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 953,959 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1050,1061 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1668,1670 **** expand_tilde(char **filename)
--- 1770,1822 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query targer list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 63,66 **** extern const char *session_username(void);
--- 71,77 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,123 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6
! #define LEXRES_NONE			7
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 172,178 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 189,195 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 635,660 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1476,1550 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int			lexresult = LEXRES_NONE;
+ 	int		lexresult_prev;
+ 	bool	is_lexer_error = false;
+ 
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	gvars = NULL;
+ 
+ 	do
+ 	{
+ 		lexresult_prev = lexresult;
+ 
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 
+ 		/* read to end */
+ 		if (is_lexer_error)
+ 			continue;
+ 
+ 		if (lexresult == LEXRES_ERROR)
+ 		{
+ 			is_lexer_error = true;
+ 			continue;
+ 		}
+ 
+ 		if (lexresult_prev == LEXRES_IDENT && lexresult == LEXRES_IDENT)
+ 		{
+ 			is_lexer_error = true;
+ 			continue;
+ 		}
+ 
+ 		if (!is_lexer_error && (lexresult_prev == LEXRES_COMMA || lexresult_prev == LEXRES_NONE)
+ 				&& lexresult == LEXRES_COMMA)
+ 			gvars = tglist_add(gvars, NULL);
+ 
+ 	} while (lexresult != LEXRES_EOL);
+ 
+ 	if (!is_lexer_error && lexresult_prev == LEXRES_COMMA)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = is_lexer_error;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 811,817 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 811,817 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1490,1496 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
          <literal>\r</> to cancel.
          </para>
  
--- 1490,1496 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or <literal>\gset</literal> to send it, or
          <literal>\r</> to cancel.
          </para>
  
***************
*** 1624,1629 **** Tue Oct 26 21:40:57 CEST 1999
--- 1624,1641 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+         Sends the current query input buffer to the server and stores
+         the query's target list a corresponding list of psql
+         variables.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars && !error)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 826,831 **** PrintQueryResults(PGresult *results)
--- 826,928 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed sucessfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("to few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"",
+ 													iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY isnot supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 953,959 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1050,1061 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1077,1082 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1179,1186 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1143,1148 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1247,1255 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1192,1198 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1299,1321 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1218,1223 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1341,1348 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1668,1670 **** expand_tilde(char **filename)
--- 1793,1845 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query targer list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 63,66 **** extern const char *session_username(void);
--- 71,77 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,122 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2	/* comma as identifiers list separator */
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6	/* unexpected char in identifiers list */
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 171,177 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 188,194 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 634,659 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1475,1571 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ typedef enum
+ {
+ 	VARLIST_PARSER_INITIAL,
+ 	VARLIST_PARSER_EXPECTED_COMMA,
+ 	VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT,
+ 	VARLIST_PARSER_ERROR
+ } VarListParserState;
+ 
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 	VarListParserState vlpState;				/* parser state */
+ 
+ 	gvars = NULL;
+ 	vlpState = VARLIST_PARSER_INITIAL;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	while (lexresult != LEXRES_EOL)
+ 	{
+ 		/* read to EOL, skip processing when some error occurs */
+ 		if (vlpState != VARLIST_PARSER_ERROR)
+ 		{
+ 			switch (lexresult)
+ 			{
+ 				case LEXRES_ERROR:
+ 					vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				case LEXRES_COMMA:
+ 					/* insert /dev/null targets */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						gvars = tglist_add(gvars, NULL);
+ 					vlpState = VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT;
+ 					break;
+ 
+ 				case LEXRES_IDENT:
+ 					/* don't allow var after var without comma */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						vlpState = VARLIST_PARSER_EXPECTED_COMMA;
+ 					else
+ 						vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				default:
+ 					/* can't get here */
+ 					fprintf(stderr, "invalid yylex result\n");
+ 					exit(1);
+ 			}
+ 		}
+ 
+ 		/* read next token */
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 	}
+ 
+ 	/* append /dev/null target when last token was comma */
+ 	if (vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = vlpState == VARLIST_PARSER_ERROR;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 811,817 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 811,817 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql.out
***************
*** 0 ****
--- 1,38 ----
+ -- \gset 
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ -- should fail
+ \gset ,,
+ \gset ,
+ to few target variables
+ \gset ,,,
+ too many target variables
+ -- should be ok
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 133,135 **** test: largeobject
--- 133,136 ----
  test: with
  test: xml
  test: stats
+ test: psql
*** /dev/null
--- b/src/test/regress/sql/psql.sql
***************
*** 0 ****
--- 1,37 ----
+ -- \gset 
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ -- should fail
+ \gset ,,
+ \gset ,
+ \gset ,,,
+ 
+ -- should be ok
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 0e9b408..a76b84d 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -832,7 +832,7 @@ PrintQueryResults(PGresult *results)
  *
  * Note: Utility function for use by SendQuery() only.
  *
- * Returns true if the query executed sucessfully, false otherwise.
+ * Returns true if the query executed successfully, false otherwise.
  */
 static bool
 StoreQueryResult(PGresult *result)
@@ -865,7 +865,7 @@ StoreQueryResult(PGresult *result)
 					{
 						if (!iter)
 						{
-							psql_error("to few target variables\n");
+							psql_error("too few target variables\n");
 							success = false;
 							break;
 						}
@@ -902,7 +902,7 @@ StoreQueryResult(PGresult *result)
 
 		case PGRES_COPY_OUT:
 		case PGRES_COPY_IN:
-			psql_error("COPY isnot supported by \\gset command\n");
+			psql_error("COPY is not supported by \\gset command\n");
 			success = false;
 			break;
 
@@ -1797,7 +1797,7 @@ expand_tilde(char **filename)
 
 
 /*
- * Add name of internal variable to query targer list
+ * Add name of internal variable to query target list
  *
  */
 TargetList
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 90ab9bd..54fa490 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -15,7 +15,7 @@ select 10, 20, 'Hello World'
 -- should fail
 \gset ,,
 \gset ,
-to few target variables
+too few target variables
 \gset ,,,
 too many target variables
 -- should be ok

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1489 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
          <literal>\r</> to cancel.
          </para>
  
--- 1483,1489 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or <literal>\gset</literal> to send it, or
          <literal>\r</> to cancel.
          </para>
  
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1634 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+         Sends the current query input buffer to the server and stores
+         the query's target list a corresponding list of psql
+         variables.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars && !error)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 827,832 **** PrintQueryResults(PGresult *results)
--- 827,930 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"",
+ 													iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 954,960 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1052,1063 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1078,1083 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1181,1188 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1144,1149 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1249,1257 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1193,1199 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1301,1323 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1219,1224 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1343,1350 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1669,1671 **** expand_tilde(char **filename)
--- 1795,1847 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 63,66 **** extern const char *session_username(void);
--- 71,77 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,122 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2	/* comma as identifiers list separator */
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6	/* unexpected char in identifiers list */
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 171,177 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 188,194 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 634,659 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1475,1571 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ typedef enum
+ {
+ 	VARLIST_PARSER_INITIAL,
+ 	VARLIST_PARSER_EXPECTED_COMMA,
+ 	VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT,
+ 	VARLIST_PARSER_ERROR
+ } VarListParserState;
+ 
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 	VarListParserState vlpState;				/* parser state */
+ 
+ 	gvars = NULL;
+ 	vlpState = VARLIST_PARSER_INITIAL;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	while (lexresult != LEXRES_EOL)
+ 	{
+ 		/* read to EOL, skip processing when some error occurs */
+ 		if (vlpState != VARLIST_PARSER_ERROR)
+ 		{
+ 			switch (lexresult)
+ 			{
+ 				case LEXRES_ERROR:
+ 					vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				case LEXRES_COMMA:
+ 					/* insert /dev/null targets */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						gvars = tglist_add(gvars, NULL);
+ 					vlpState = VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT;
+ 					break;
+ 
+ 				case LEXRES_IDENT:
+ 					/* don't allow var after var without comma */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						vlpState = VARLIST_PARSER_EXPECTED_COMMA;
+ 					else
+ 						vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				default:
+ 					/* can't get here */
+ 					fprintf(stderr, "invalid yylex result\n");
+ 					exit(1);
+ 			}
+ 		}
+ 
+ 		/* read next token */
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 	}
+ 
+ 	/* append /dev/null target when last token was comma */
+ 	if (vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = vlpState == VARLIST_PARSER_ERROR;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql.out
***************
*** 0 ****
--- 1,39 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: syntax error
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 133,135 **** test: largeobject
--- 133,136 ----
  test: with
  test: xml
  test: stats
+ test: psql
*** /dev/null
--- b/src/test/regress/sql/psql.sql
***************
*** 0 ****
--- 1,36 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 3693a5a..c4ac674 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1483,8 +1483,8 @@ testdb=>
         way. Use <command>\i</command> for that.) This means that
         if the query ends with (or contains) a semicolon, it is
         immediately executed. Otherwise it will merely wait in the
-        query buffer; type semicolon, <literal>\g</> or <literal>\gset</literal> to send it, or
-        <literal>\r</> to cancel.
+        query buffer; type semicolon, <literal>\g</> or
+        <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
         </para>
 
         <para>
@@ -1621,9 +1621,19 @@ Tue Oct 26 21:40:57 CEST 1999
 
         <listitem>
         <para>
-        Sends the current query input buffer to the server and stores
-        the query's target list a corresponding list of psql
-        variables.
+         Sends the current query input buffer to the server and stores the
+         query's output into corresponding <replaceable
+         class="parameter">variable</replaceable>.  The preceding query must
+         return only one row, and the number of variables must be same as the
+         number of elements in <command>SELECT</command> list.  If you don't
+         need any of items in <command>SELECT</command> list, you can omit
+         corresponding <replaceable class="parameter">variable</replaceable>.
+         Example:
+<programlisting>
+foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+foo=&gt; \echo :var1 :var3
+hello world!
+</programlisting>
         </para>
         </listitem>
       </varlistentry>

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars && !error)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"",
+ 													iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1177 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1133,1138 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1238,1246 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1290,1312 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1208,1213 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1332,1339 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1784,1836 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,122 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2	/* comma as identifiers list separator */
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6	/* unexpected char in identifiers list */
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 171,177 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 188,194 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 634,659 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1475,1571 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ typedef enum
+ {
+ 	VARLIST_PARSER_INITIAL,
+ 	VARLIST_PARSER_EXPECTED_COMMA,
+ 	VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT,
+ 	VARLIST_PARSER_ERROR
+ } VarListParserState;
+ 
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 	VarListParserState vlpState;				/* parser state */
+ 
+ 	gvars = NULL;
+ 	vlpState = VARLIST_PARSER_INITIAL;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	while (lexresult != LEXRES_EOL)
+ 	{
+ 		/* read to EOL, skip processing when some error occurs */
+ 		if (vlpState != VARLIST_PARSER_ERROR)
+ 		{
+ 			switch (lexresult)
+ 			{
+ 				case LEXRES_ERROR:
+ 					vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				case LEXRES_COMMA:
+ 					/* insert /dev/null targets */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						gvars = tglist_add(gvars, NULL);
+ 					vlpState = VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT;
+ 					break;
+ 
+ 				case LEXRES_IDENT:
+ 					/* don't allow var after var without comma */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						vlpState = VARLIST_PARSER_EXPECTED_COMMA;
+ 					else
+ 						vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				default:
+ 					/* can't get here */
+ 					fprintf(stderr, "invalid yylex result\n");
+ 					exit(1);
+ 			}
+ 		}
+ 
+ 		/* read next token */
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 	}
+ 
+ 	/* append /dev/null target when last token was comma */
+ 	if (vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = vlpState == VARLIST_PARSER_ERROR;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,39 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: syntax error
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,36 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars && !error)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1177 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1133,1138 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1238,1246 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1290,1312 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1208,1213 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1332,1339 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1784,1836 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,122 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2	/* comma as identifiers list separator */
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6	/* unexpected char in identifiers list */
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 171,177 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 188,194 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 634,659 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1475,1571 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ typedef enum
+ {
+ 	VARLIST_PARSER_INITIAL,
+ 	VARLIST_PARSER_EXPECTED_COMMA,
+ 	VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT,
+ 	VARLIST_PARSER_ERROR
+ } VarListParserState;
+ 
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 	VarListParserState vlpState;				/* parser state */
+ 
+ 	gvars = NULL;
+ 	vlpState = VARLIST_PARSER_INITIAL;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	while (lexresult != LEXRES_EOL)
+ 	{
+ 		/* read to EOL, skip processing when some error occurs */
+ 		if (vlpState != VARLIST_PARSER_ERROR)
+ 		{
+ 			switch (lexresult)
+ 			{
+ 				case LEXRES_ERROR:
+ 					vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				case LEXRES_COMMA:
+ 					/* insert /dev/null targets */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						gvars = tglist_add(gvars, NULL);
+ 					vlpState = VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT;
+ 					break;
+ 
+ 				case LEXRES_IDENT:
+ 					/* don't allow var after var without comma */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						vlpState = VARLIST_PARSER_EXPECTED_COMMA;
+ 					else
+ 						vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				default:
+ 					/* can't get here */
+ 					fprintf(stderr, "invalid yylex result\n");
+ 					exit(1);
+ 			}
+ 		}
+ 
+ 		/* read next token */
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 	}
+ 
+ 	/* append /dev/null target when last token was comma */
+ 	if (vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = vlpState == VARLIST_PARSER_ERROR;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,39 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: syntax error
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,36 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,776 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool	error;
+ 
+ 		pset.gvars = psql_scan_slash_vars(scan_state, &error);
+ 
+ 		if (!pset.gvars && !error)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 		else if (error)
+ 		{
+ 			psql_error("\\%s: syntax error\n", cmd);
+ 			status = PSQL_CMD_NOSEND;
+ 			tglist_free(pset.gvars);
+ 			pset.gvars = NULL;
+ 		}
+ 		else
+ 			status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1177 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1133,1138 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1238,1246 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1290,1312 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1208,1213 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1332,1339 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1784,1836 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,70 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern TargetList psql_scan_slash_vars(PsqlScanState state,
+ 							bool *error);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 106,118 **** static char *option_quote;
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_BACKSLASH	2	/* backslash command start */
! #define LEXRES_OK			3	/* OK completion of backslash argument */
! 
  
  int	yylex(void);
  
--- 106,122 ----
  static int	unquoted_option_chars;
  static int	backtick_start_offset;
  
+ TargetList gvars;
+ 
  
  /* Return values from yylex() */
  #define LEXRES_EOL			0	/* end of input */
  #define LEXRES_SEMI			1	/* command-terminating semicolon found */
! #define LEXRES_COMMA			2	/* comma as identifiers list separator */
! #define LEXRES_BACKSLASH	3	/* backslash command start */
! #define LEXRES_IDENT			4	/* valid internal variable identifier */
! #define LEXRES_OK			5	/* OK completion of backslash argument */
! #define LEXRES_ERROR			6	/* unexpected char in identifiers list */
  
  int	yylex(void);
  
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 171,177 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of variables
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 188,194 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 634,663 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					gvars = tglist_add(gvars, yytext);
+ 					return LEXRES_IDENT;
+ 				}
+ 
+ ","		{
+ 					return LEXRES_COMMA;
+ 				}
+ 
+ "\\\\"		{
+ 					return LEXRES_EOL;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					return LEXRES_ERROR;
+ 				}
+ 
+ }
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1449,1454 **** psql_scan_slash_command(PsqlScanState state)
--- 1479,1575 ----
  }
  
  /*
+  * returns identifier from identifier list
+  *
+  *    when comma_expected is true, when we require comma before identifier
+  *    error is true, when unexpected char was identified or missing
+  *        comma.
+  *
+  */
+ typedef enum
+ {
+ 	VARLIST_PARSER_INITIAL,
+ 	VARLIST_PARSER_EXPECTED_COMMA,
+ 	VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT,
+ 	VARLIST_PARSER_ERROR
+ } VarListParserState;
+ 
+ TargetList
+ psql_scan_slash_vars(PsqlScanState state,
+ 						bool *error)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 	VarListParserState vlpState;				/* parser state */
+ 
+ 	gvars = NULL;
+ 	vlpState = VARLIST_PARSER_INITIAL;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	while (lexresult != LEXRES_EOL)
+ 	{
+ 		/* read to EOL, skip processing when some error occurs */
+ 		if (vlpState != VARLIST_PARSER_ERROR)
+ 		{
+ 			switch (lexresult)
+ 			{
+ 				case LEXRES_ERROR:
+ 					vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				case LEXRES_COMMA:
+ 					/* insert /dev/null targets */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						gvars = tglist_add(gvars, NULL);
+ 					vlpState = VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT;
+ 					break;
+ 
+ 				case LEXRES_IDENT:
+ 					/* don't allow var after var without comma */
+ 					if (vlpState == VARLIST_PARSER_INITIAL ||
+ 							vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 						vlpState = VARLIST_PARSER_EXPECTED_COMMA;
+ 					else
+ 						vlpState = VARLIST_PARSER_ERROR;
+ 					break;
+ 
+ 				default:
+ 					/* can't get here */
+ 					fprintf(stderr, "invalid yylex result\n");
+ 					exit(1);
+ 			}
+ 		}
+ 
+ 		/* read next token */
+ 		BEGIN(xvl);
+ 		lexresult = yylex();
+ 	}
+ 
+ 	/* append /dev/null target when last token was comma */
+ 	if (vlpState == VARLIST_PARSER_EXPECTED_COMMA_OR_IDENT)
+ 		gvars = tglist_add(gvars, NULL);
+ 
+ 	*error = vlpState == VARLIST_PARSER_ERROR;
+ 
+ 	return gvars;
+ }
+ 
+ /*
   * Parse off the next argument for a backslash command, and return it as a
   * malloc'd string.  If there are no more arguments, returns NULL.
   *
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,43 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: syntax error
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ (1 row)
+ 
+ 1
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,38 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 71,77 **** static void printSSLInfo(void);
  static void checkWin32Codepage(void);
  #endif
  
! 
  
  /*----------
   * HandleSlashCmds:
--- 71,86 ----
  static void checkWin32Codepage(void);
  #endif
  
! /*
!  * Possible states for simple state machine, that is used for
!  * parsing target list - list of varnames separated by comma.
!  */
! typedef enum
! {
! 	VARLIST_INITIAL,
! 	VARLIST_EXPECTED_COMMA,
! 	VARLIST_EXPECTED_COMMA_OR_IDENT
! } VarlistParserState;
  
  /*----------
   * HandleSlashCmds:
***************
*** 748,753 **** exec_command(const char *cmd,
--- 757,831 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool value_is_valid;
+ 		char *value;
+ 		VarlistParserState state = VARLIST_INITIAL;
+ 
+ 		/* expected valid target list */
+ 		success = true;
+ 
+ 		pset.gvars = NULL;
+ 		while ((value = psql_scan_varlist_varname(scan_state, &value_is_valid)))
+ 		{
+ 			if (value_is_valid && success)
+ 			{
+ 				if (strcmp(value, ",") == 0)
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						pset.gvars = tglist_add(pset.gvars, NULL);
+ 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 				}
+ 				else
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 					{
+ 						pset.gvars = tglist_add(pset.gvars, value);
+ 						state = VARLIST_EXPECTED_COMMA;
+ 					}
+ 					else
+ 						success = false;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				success = false;
+ 				/* but continue, we would to read to eol */
+ 			}
+ 
+ 			free(value);
+ 		}
+ 
+ 		/* final check and target list completation */
+ 		if (pset.gvars != NULL)
+ 		{
+ 			if (success)
+ 			{
+ 				if (state == VARLIST_EXPECTED_COMMA_OR_IDENT && success)
+ 					pset.gvars = tglist_add(pset.gvars, NULL);
+ 				status = PSQL_CMD_SEND;
+ 			}
+ 			else
+ 			{
+ 				psql_error("\\%s: syntax error\n", cmd);
+ 				tglist_free(pset.gvars);
+ 				pset.gvars = NULL;
+ 				status = PSQL_CMD_NOSEND;
+ 
+ 			}
+ 		}
+ 		else
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1177 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1133,1138 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1238,1246 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1290,1312 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1208,1213 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1332,1339 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1784,1836 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 8,13 ****
--- 8,14 ----
  #ifndef PSQLSCAN_H
  #define PSQLSCAN_H
  
+ #include "common.h"
  #include "pqexpbuffer.h"
  
  #include "prompt.h"
***************
*** 33,39 **** enum slash_option_type
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL					/* no expansion of backticks or variables */
  };
  
  
--- 34,41 ----
  	OT_SQLIDHACK,				/* SQL identifier, but don't downcase */
  	OT_FILEPIPE,				/* it's a filename or pipe */
  	OT_WHOLE_LINE,				/* just snarf the rest of the line */
! 	OT_NO_EVAL,					/* no expansion of backticks or variables */
! 	OT_VARLIST				/* returns variable's identifier or comma */
  };
  
  
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 61,69 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern char *psql_scan_varlist_varname(PsqlScanState state, bool *is_ok);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 167,173 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of varnames
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 184,190 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 630,667 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ ","		{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ "\\\\"		{
+ 					return LEXRES_EOL;
+ 				}
+ 
+ "\\"		{
+ 					yyless(0);
+ 					return LEXRES_EOL;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					ECHO;
+ 					return LEXRES_EOL;
+ 				}
+ 
+ }
+ 
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1937,1939 **** escape_variable(bool as_ident)
--- 1971,2023 ----
  	 */
  	emit(yytext, yyleng);
  }
+ 
+ /*
+  * psql_scan_varlist - scan variable list for \gset command
+  *
+  * Returns next lexem from variable list separated by comma. When
+  * returned string is not empty and out parameter is_ok is false,
+  * then this string contains unexpected char. Returns NULL, when
+  * EOL is detected.
+  */
+ char *
+ psql_scan_varlist_varname(PsqlScanState state, bool *is_ok)
+ {
+ 	PQExpBufferData mybuf;
+ 	int	lexresult;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Build a local buffer */
+ 	initPQExpBuffer(&mybuf);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	if (lexresult == LEXRES_OK)
+ 	{
+ 		*is_ok = true;
+ 	}
+ 	else if (lexresult == LEXRES_EOL && mybuf.len == 0)
+ 	{
+ 		*is_ok = true;
+ 		termPQExpBuffer(&mybuf);
+ 		return NULL;
+ 	}
+ 	else
+ 	{
+ 		*is_ok = false;
+ 	}
+ 
+ 	return mybuf.data;
+ }
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,48 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: missing required argument
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ (1 row)
+ 
+ 1
+ select 1,2 \gset x,y \echo :x \echo :y
+ (1 row)
+ 
+ 1
+ 2
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 105,107 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 105,109 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,40 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x
+ 
+ select 1,2 \gset x,y \echo :x \echo :y

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 71,77 **** static void printSSLInfo(void);
  static void checkWin32Codepage(void);
  #endif
  
! 
  
  /*----------
   * HandleSlashCmds:
--- 71,86 ----
  static void checkWin32Codepage(void);
  #endif
  
! /*
!  * Possible states for simple state machine, that is used for
!  * parsing target list - list of varnames separated by comma.
!  */
! typedef enum
! {
! 	VARLIST_INITIAL,
! 	VARLIST_EXPECTED_COMMA,
! 	VARLIST_EXPECTED_COMMA_OR_IDENT
! } VarlistParserState;
  
  /*----------
   * HandleSlashCmds:
***************
*** 748,753 **** exec_command(const char *cmd,
--- 757,831 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool value_is_valid;
+ 		char *value;
+ 		VarlistParserState state = VARLIST_INITIAL;
+ 
+ 		/* expected valid target list */
+ 		success = true;
+ 
+ 		pset.gvars = NULL;
+ 		while ((value = psql_scan_varlist_varname(scan_state, &value_is_valid)))
+ 		{
+ 			if (value_is_valid && success)
+ 			{
+ 				if (strcmp(value, ",") == 0)
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						pset.gvars = tglist_add(pset.gvars, NULL);
+ 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 				}
+ 				else
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 					{
+ 						pset.gvars = tglist_add(pset.gvars, value);
+ 						state = VARLIST_EXPECTED_COMMA;
+ 					}
+ 					else
+ 						success = false;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				success = false;
+ 				/* but continue, we would to read to eol */
+ 			}
+ 
+ 			free(value);
+ 		}
+ 
+ 		/* final check and target list completation */
+ 		if (pset.gvars != NULL)
+ 		{
+ 			if (success)
+ 			{
+ 				if (state == VARLIST_EXPECTED_COMMA_OR_IDENT && success)
+ 					pset.gvars = tglist_add(pset.gvars, NULL);
+ 				status = PSQL_CMD_SEND;
+ 			}
+ 			else
+ 			{
+ 				psql_error("\\%s: syntax error\n", cmd);
+ 				tglist_free(pset.gvars);
+ 				pset.gvars = NULL;
+ 				status = PSQL_CMD_NOSEND;
+ 
+ 			}
+ 		}
+ 		else
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1177 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		initial_loop;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1133,1138 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1238,1246 ----
  	/* clear any pre-existing error indication on the output stream */
  	clearerr(pset.queryFout);
  
+ 	/* we would to allow store result to variables only once */
+ 	initial_loop = true;
+ 
  	for (;;)
  	{
  		if (pset.timing)
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1290,1312 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				break;
! 			}
! 		}
! 		else if (store_result && !initial_loop && ntuples > 0)
! 		{
! 			psql_error("too many rows\n");
! 			flush_error = fflush(pset.queryFout);
! 			break;
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1208,1213 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1332,1339 ----
  		if (ntuples < pset.fetch_count || cancel_pressed || flush_error ||
  			ferror(pset.queryFout))
  			break;
+ 
+ 		initial_loop = false;
  	}
  
  	/* close \g argument file/pipe, restore old setting */
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1784,1836 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 59,67 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern char *psql_scan_varlist_varname(PsqlScanState state, bool *is_ok);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 167,173 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of varnames
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 184,190 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 630,667 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ ","		{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ "\\\\"		{
+ 					return LEXRES_EOL;
+ 				}
+ 
+ "\\"		{
+ 					yyless(0);
+ 					return LEXRES_EOL;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					ECHO;
+ 					return LEXRES_EOL;
+ 				}
+ 
+ }
+ 
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1937,1939 **** escape_variable(bool as_ident)
--- 1971,2022 ----
  	 */
  	emit(yytext, yyleng);
  }
+ 
+ /*
+  * psql_scan_varlist - scan variable list for \gset command
+  *
+  * Returns next variable name or comma from variable list.  When returned
+  * string is not empty and out parameter is_ok is false, then this string
+  * contains unexpected character.  Returns NULL, when EOL is detected.
+  */
+ char *
+ psql_scan_varlist_varname(PsqlScanState state, bool *is_ok)
+ {
+ 	PQExpBufferData mybuf;
+ 	int			lexresult;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Build a local buffer */
+ 	initPQExpBuffer(&mybuf);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	if (lexresult == LEXRES_OK)
+ 	{
+ 		*is_ok = true;
+ 	}
+ 	else if (lexresult == LEXRES_EOL && mybuf.len == 0)
+ 	{
+ 		*is_ok = true;
+ 		termPQExpBuffer(&mybuf);
+ 		return NULL;
+ 	}
+ 	else
+ 	{
+ 		*is_ok = false;
+ 	}
+ 
+ 	return mybuf.data;
+ }
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,64 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: missing required argument
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ (1 row)
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ (1 row)
+ 
+ 1
+ select 1,2 \gset x,y \echo :x \echo :y
+ (1 row)
+ 
+ 1
+ 2
+ select 1,2 \gset x,y \\ \g \echo :x :y
+ (1 row)
+ 
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ select 1,2 \g \gset x,y \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 109,111 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 109,113 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,45 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x
+ 
+ select 1,2 \gset x,y \echo :x \echo :y
+ 
+ select 1,2 \gset x,y \\ \g \echo :x :y
+ 
+ select 1,2 \g \gset x,y \echo :x :y
+ 

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1644 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 71,77 **** static void printSSLInfo(void);
  static void checkWin32Codepage(void);
  #endif
  
! 
  
  /*----------
   * HandleSlashCmds:
--- 71,86 ----
  static void checkWin32Codepage(void);
  #endif
  
! /*
!  * Possible states for simple state machine, that is used for
!  * parsing target list - list of varnames separated by comma.
!  */
! typedef enum
! {
! 	VARLIST_INITIAL,
! 	VARLIST_EXPECTED_COMMA,
! 	VARLIST_EXPECTED_COMMA_OR_IDENT
! } VarlistParserState;
  
  /*----------
   * HandleSlashCmds:
***************
*** 748,753 **** exec_command(const char *cmd,
--- 757,831 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		bool value_is_valid;
+ 		char *value;
+ 		VarlistParserState state = VARLIST_INITIAL;
+ 
+ 		/* expected valid target list */
+ 		success = true;
+ 
+ 		pset.gvars = NULL;
+ 		while ((value = psql_scan_varlist_varname(scan_state, &value_is_valid)))
+ 		{
+ 			if (value_is_valid && success)
+ 			{
+ 				if (strcmp(value, ",") == 0)
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						pset.gvars = tglist_add(pset.gvars, NULL);
+ 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 				}
+ 				else
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 					{
+ 						pset.gvars = tglist_add(pset.gvars, value);
+ 						state = VARLIST_EXPECTED_COMMA;
+ 					}
+ 					else
+ 						success = false;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				success = false;
+ 				/* but continue, we would to read to eol */
+ 			}
+ 
+ 			free(value);
+ 		}
+ 
+ 		/* final check and target list completation */
+ 		if (pset.gvars != NULL)
+ 		{
+ 			if (success)
+ 			{
+ 				if (state == VARLIST_EXPECTED_COMMA_OR_IDENT && success)
+ 					pset.gvars = tglist_add(pset.gvars, NULL);
+ 				status = PSQL_CMD_SEND;
+ 			}
+ 			else
+ 			{
+ 				psql_error("\\%s: syntax error\n", cmd);
+ 				tglist_free(pset.gvars);
+ 				pset.gvars = NULL;
+ 				status = PSQL_CMD_NOSEND;
+ 
+ 			}
+ 		}
+ 		else
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,919 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							if (!SetVariable(pset.vars, iter->name,
+ 										   PQgetvalue(result, 0, i)))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1041,1052 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1170,1176 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1182,1191 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
  		/* after the first result set, disallow header decoration */
  		my_popt.topt.start_table = false;
  		my_popt.topt.prior_records += ntuples;
--- 1286,1320 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			/* initial iteration when tartget are variables */
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				break;
! 			}
! 		}
! 		else if (store_result)
! 		{
! 			/* must be second loop */
! 			if (ntuples > 0)
! 			{
! 				psql_error("too many rows\n");
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				OK = false;
! 				break;
! 			}
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
+ 
  		/* after the first result set, disallow header decoration */
  		my_popt.topt.start_table = false;
  		my_popt.topt.prior_records += ntuples;
***************
*** 1254,1259 **** cleanup:
--- 1383,1389 ----
  		PQclear(results);
  	}
  
+ 
  	if (pset.timing)
  	{
  		INSTR_TIME_SET_CURRENT(after);
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1788,1840 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/psqlscan.h
--- b/src/bin/psql/psqlscan.h
***************
*** 59,64 **** extern char *psql_scan_slash_option(PsqlScanState state,
--- 59,67 ----
  					   char *quote,
  					   bool semicolon);
  
+ extern char *psql_scan_varlist_varname(PsqlScanState state, bool *is_ok);
+ 
+ 
  extern void psql_scan_slash_command_end(PsqlScanState state);
  
  #endif   /* PSQLSCAN_H */
*** a/src/bin/psql/psqlscan.l
--- b/src/bin/psql/psqlscan.l
***************
*** 167,172 **** static void escape_variable(bool as_ident);
--- 167,173 ----
   *  <xdolq> $foo$ quoted strings
   *  <xui> quoted identifier with Unicode escapes
   *  <xus> quoted string with Unicode escapes
+  *  <xvl> comma separated list of varnames
   *
   * Note: we intentionally don't mimic the backend's <xeu> state; we have
   * no need to distinguish it from <xe> state, and no good way to get out
***************
*** 183,188 **** static void escape_variable(bool as_ident);
--- 184,190 ----
  %x xdolq
  %x xui
  %x xus
+ %x xvl
  /* Additional exclusive states for psql only: lex backslash commands */
  %x xslashcmd
  %x xslashargstart
***************
*** 628,633 **** other			.
--- 630,667 ----
  					ECHO;
  				}
  
+ <xvl>{
+ 
+ {identifier}	{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ ","		{
+ 					ECHO;
+ 					return LEXRES_OK;
+ 				}
+ 
+ "\\\\"		{
+ 					return LEXRES_EOL;
+ 				}
+ 
+ "\\"		{
+ 					yyless(0);
+ 					return LEXRES_EOL;
+ 				}
+ 
+ {horiz_space}+	{ }
+ 
+ . |
+ \n		{
+ 					ECHO;
+ 					return LEXRES_EOL;
+ 				}
+ 
+ }
+ 
+ 
  {xufailed}	{
  					/* throw back all but the initial u/U */
  					yyless(1);
***************
*** 1937,1939 **** escape_variable(bool as_ident)
--- 1971,2022 ----
  	 */
  	emit(yytext, yyleng);
  }
+ 
+ /*
+  * psql_scan_varlist - scan variable list for \gset command
+  *
+  * Returns next variable name or comma from variable list.  When returned
+  * string is not empty and out parameter is_ok is false, then this string
+  * contains unexpected character.  Returns NULL, when EOL is detected.
+  */
+ char *
+ psql_scan_varlist_varname(PsqlScanState state, bool *is_ok)
+ {
+ 	PQExpBufferData mybuf;
+ 	int			lexresult;
+ 
+ 	/* Must be scanning already */
+ 	psql_assert(state->scanbufhandle);
+ 
+ 	/* Build a local buffer */
+ 	initPQExpBuffer(&mybuf);
+ 
+ 	/* Set up static variables that will be used by yylex */
+ 	cur_state = state;
+ 	output_buf = &mybuf;
+ 
+ 	if (state->buffer_stack != NULL)
+ 		yy_switch_to_buffer(state->buffer_stack->buf);
+ 	else
+ 		yy_switch_to_buffer(state->scanbufhandle);
+ 
+ 	BEGIN(xvl);
+ 	lexresult = yylex();
+ 
+ 	if (lexresult == LEXRES_OK)
+ 	{
+ 		*is_ok = true;
+ 	}
+ 	else if (lexresult == LEXRES_EOL && mybuf.len == 0)
+ 	{
+ 		*is_ok = true;
+ 		termPQExpBuffer(&mybuf);
+ 		return NULL;
+ 	}
+ 	else
+ 	{
+ 		*is_ok = false;
+ 	}
+ 
+ 	return mybuf.data;
+ }
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 9,14 ****
--- 9,15 ----
  #define SETTINGS_H
  
  
+ #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 74,80 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,56 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ \gset ,, -- error
+ \gset: syntax error
+ \gset , -- error
+ \gset: syntax error
+ \gset ,,, -- error
+ \gset: syntax error
+ \gset -- error
+ \gset: missing required argument
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ 1
+ select 1,2 \gset x,y \echo :x \echo :y
+ 1
+ 2
+ select 1,2 \gset x,y \\ \g \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ select 1,2 \g \gset x,y \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 109,111 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 109,113 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,45 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ \gset ,, -- error
+ \gset , -- error
+ \gset ,,, -- error
+ \gset -- error
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x
+ 
+ select 1,2 \gset x,y \echo :x \echo :y
+ 
+ select 1,2 \gset x,y \\ \g \echo :x :y
+ 
+ select 1,2 \g \gset x,y \echo :x :y
+ 

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1648 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         <para>
+          When this command fails, then related <replaceable
+          class="parameter">variables</replaceable> has undefined content.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 71,77 **** static void printSSLInfo(void);
  static void checkWin32Codepage(void);
  #endif
  
! 
  
  /*----------
   * HandleSlashCmds:
--- 71,86 ----
  static void checkWin32Codepage(void);
  #endif
  
! /*
!  * Possible states for simple state machine, that is used for
!  * parsing target list - list of varnames separated by comma.
!  */
! typedef enum
! {
! 	VARLIST_INITIAL,
! 	VARLIST_EXPECTED_COMMA,
! 	VARLIST_EXPECTED_COMMA_OR_IDENT
! } VarlistParserState;
  
  /*----------
   * HandleSlashCmds:
***************
*** 748,753 **** exec_command(const char *cmd,
--- 757,870 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		char *packet;
+ 		VarlistParserState state = VARLIST_INITIAL;
+ 
+ 		/* expected valid target list */
+ 		success = true;
+ 		pset.gvars = NULL;
+ 
+ 		/*
+ 		 * So we would to enable subtitution, but we know so target varname should
+ 		 * not use comma. Recheck of variable name is done by variable setting routine.
+ 		 * psql_scan_slash_option can returns zero or more identifiers separated by
+ 		 * comma. We cennot to use OT_WHOLE_LINE, because variable substitution is not
+ 		 * supported there.
+ 		 */
+ 		while ((packet = psql_scan_slash_option(scan_state,
+ 											 OT_NORMAL, NULL, false)))
+ 		{
+ 			char *token = packet;
+ 			bool process_comma = false;
+ 
+ 			while (success && (*token || process_comma))
+ 			{
+ 				if (process_comma)
+ 				{
+ 					if (state == VARLIST_INITIAL ||
+ 							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						pset.gvars = tglist_add(pset.gvars, NULL);
+ 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 
+ 					process_comma = false;
+ 				}
+ 				else
+ 				{
+ 					char *ptr = token;
+ 
+ 					/* skip initial blank chars */
+ 					while (*ptr && isblank(*ptr))
+ 						ptr++;
+ 
+ 					token = ptr;
+ 
+ 					/* search separator */
+ 					while (*ptr && *ptr != ',')
+ 						ptr++;
+ 
+ 					/* replace separator by zero char */
+ 					if (*ptr == ',')
+ 					{
+ 						process_comma = true;
+ 						*ptr = '\0';
+ 					}
+ 
+ 					/* process token when it is non empty string */
+ 					if (token != ptr)
+ 					{
+ 						if (state == VARLIST_INITIAL ||
+ 								state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						{
+ 							pset.gvars = tglist_add(pset.gvars, token);
+ 							state = VARLIST_EXPECTED_COMMA;
+ 						}
+ 						else
+ 						{
+ 							success = false;
+ 							break;
+ 						}
+ 					}
+ 
+ 					/* move pointer to next token when comma is found */
+ 					if (process_comma)
+ 						token = ptr + 1;
+ 					else
+ 						/* leave when there are no next token */
+ 						break;
+ 				}
+ 			}
+ 			free(packet);
+ 		}
+ 
+ 		/* final check and target list completation */
+ 		if (pset.gvars != NULL)
+ 		{
+ 			if (success)
+ 			{
+ 				if (state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 					pset.gvars = tglist_add(pset.gvars, NULL);
+ 				status = PSQL_CMD_SEND;
+ 			}
+ 			else
+ 			{
+ 				psql_error("\\%s: syntax error\n", cmd);
+ 				tglist_free(pset.gvars);
+ 				pset.gvars = NULL;
+ 				status = PSQL_CMD_NOSEND;
+ 
+ 			}
+ 		}
+ 		else
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 816,821 **** PrintQueryResults(PGresult *results)
--- 816,925 ----
  	return success;
  }
  
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			{
+ 				int	i;
+ 
+ 				if (PQntuples(result) < 1)
+ 				{
+ 					psql_error("no data found\n");
+ 					success = false;
+ 				}
+ 				else if (PQntuples(result) > 1)
+ 				{
+ 					psql_error("too many rows\n");
+ 					success = false;
+ 				}
+ 				else
+ 				{
+ 					TargetListData *iter = (TargetListData *) pset.gvars;
+ 
+ 					success = true;
+ 
+ 					for (i = 0; i < PQnfields(result); i++)
+ 					{
+ 						if (!iter)
+ 						{
+ 							psql_error("too few target variables\n");
+ 							success = false;
+ 							break;
+ 						}
+ 
+ 						if (iter->name)
+ 						{
+ 							char	*value;
+ 
+ 							if (PQgetisnull(result, 0, i))
+ 								value = pset.popt.nullPrint ? pset.popt.nullPrint : "";
+ 							else
+ 								value = PQgetvalue(result, 0, i);
+ 
+ 							if (!SetVariable(pset.vars, iter->name, value))
+ 							{
+ 								psql_error("invalid variable name: \"%s\"\n",
+ 										   iter->name);
+ 								success = false;
+ 								break;
+ 							}
+ 						}
+ 
+ 						iter = iter->next;
+ 					}
+ 
+ 					if (success && iter != NULL)
+ 					{
+ 						psql_error("too many target variables\n");
+ 						success = false;
+ 					}
+ 				}
+ 			}
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
  
  /*
   * SendQuery: send the query string to the backend
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1047,1058 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1176,1182 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1292,1322 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			/* initial iteration when tartget are variables */
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				break;
! 			}
! 		}
! 		else if (store_result)
! 		{
! 			/* must be second loop */
! 			if (ntuples > 0)
! 			{
! 				psql_error("too many rows\n");
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				OK = false;
! 				break;
! 			}
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1792,1844 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 21,26 ****
--- 21,34 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 62,65 **** extern const char *session_username(void);
--- 70,76 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 8,14 ****
  #ifndef SETTINGS_H
  #define SETTINGS_H
  
! 
  #include "variables.h"
  #include "print.h"
  
--- 8,14 ----
  #ifndef SETTINGS_H
  #define SETTINGS_H
  
! #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 73,79 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,68 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ -- errors
+ \gset ,,
+ \gset ,
+ too few target variables
+ \gset ,,,
+ too many target variables
+ \gset
+ \gset: missing required argument
+ -- using badly varnames - detected when variable is accessed
+ -- note: row comments are not supported by psql lexer when command option
+ -- is read - so these statements finish by syntax error - not expected
+ -- "missing required argument" error.
+ \set --varname 10
+ \set: error while setting variable
+ \gset --varname1, varname2, varname3
+ invalid variable name: "--varname1"
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ 1
+ select 1,2 \gset x,y \echo :x \echo :y
+ 1
+ 2
+ select 1,2 \gset x,y \\ \g \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ select 1,2 \g \gset x,y \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ \pset null '(null)'
+ select NULL \gset var1
+ \echo :var1
+ (null)
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 109,111 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 109,113 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 134,136 **** test: largeobject
--- 134,137 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,57 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ -- errors
+ \gset ,,
+ \gset ,
+ \gset ,,,
+ \gset
+ 
+ -- using badly varnames - detected when variable is accessed
+ -- note: row comments are not supported by psql lexer when command option
+ -- is read - so these statements finish by syntax error - not expected
+ -- "missing required argument" error.
+ \set --varname 10
+ \gset --varname1, varname2, varname3
+ 
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x
+ 
+ select 1,2 \gset x,y \echo :x \echo :y
+ 
+ select 1,2 \gset x,y \\ \g \echo :x :y
+ 
+ select 1,2 \g \gset x,y \echo :x :y
+ 
+ \pset null '(null)'
+ select NULL \gset var1
+ \echo :var1

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 645ba5b..d36e5de 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -71,6 +71,7 @@ static void printSSLInfo(void);
 static void checkWin32Codepage(void);
 #endif
 
+
 /*
  * Possible states for simple state machine, that is used for
  * parsing target list - list of varnames separated by comma.
@@ -760,7 +761,7 @@ exec_command(const char *cmd,
 	/* \gset send query and store result */
 	else if (strcmp(cmd, "gset") == 0)
 	{
-		char *packet;
+		char	   *packet;
 		VarlistParserState state = VARLIST_INITIAL;
 
 		/* expected valid target list */
@@ -768,32 +769,31 @@ exec_command(const char *cmd,
 		pset.gvars = NULL;
 
 		/*
-		 * So we would to enable subtitution, but we know so target varname should
-		 * not use comma. Recheck of variable name is done by variable setting routine.
-		 * psql_scan_slash_option can returns zero or more identifiers separated by
-		 * comma. We cennot to use OT_WHOLE_LINE, because variable substitution is not
-		 * supported there.
+		 * So we would to enable substitution, but we know so target varname
+		 * should not use comma. Recheck of variable name is done by variable
+		 * setting routine.  psql_scan_slash_option can returns zero or more
+		 * identifiers separated by comma. We cannot to use OT_WHOLE_LINE,
+		 * because variable substitution is not supported there.
 		 */
 		while ((packet = psql_scan_slash_option(scan_state,
-											 OT_NORMAL, NULL, false)))
+												OT_NORMAL, NULL, false)))
 		{
-			char *token = packet;
-			bool process_comma = false;
+			char	   *token = packet;
+			bool		process_comma = false;
 
 			while (success && (*token || process_comma))
 			{
 				if (process_comma)
 				{
 					if (state == VARLIST_INITIAL ||
-							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+						state == VARLIST_EXPECTED_COMMA_OR_IDENT)
 						pset.gvars = tglist_add(pset.gvars, NULL);
 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
-
 					process_comma = false;
 				}
 				else
 				{
-					char *ptr = token;
+					char	   *ptr = token;
 
 					/* skip initial blank chars */
 					while (*ptr && isblank(*ptr))
@@ -816,7 +816,7 @@ exec_command(const char *cmd,
 					if (token != ptr)
 					{
 						if (state == VARLIST_INITIAL ||
-								state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+							state == VARLIST_EXPECTED_COMMA_OR_IDENT)
 						{
 							pset.gvars = tglist_add(pset.gvars, token);
 							state = VARLIST_EXPECTED_COMMA;

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1483,1490 **** testdb=>
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon or <literal>\g</> to send it, or
!         <literal>\r</> to cancel.
          </para>
  
          <para>
--- 1483,1490 ----
          way. Use <command>\i</command> for that.) This means that
          if the query ends with (or contains) a semicolon, it is
          immediately executed. Otherwise it will merely wait in the
!         query buffer; type semicolon, <literal>\g</> or
!         <literal>\gset</literal> to send it, or <literal>\r</> to cancel.
          </para>
  
          <para>
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1648 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">variable</replaceable> [ ,<replaceable class="parameter">variable</replaceable> ... ] </term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row, and the number of variables must be same as the
+          number of elements in <command>SELECT</command> list.  If you don't
+          need any of items in <command>SELECT</command> list, you can omit
+          corresponding <replaceable class="parameter">variable</replaceable>.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello', 'wonderful', 'world!' \gset var1,,var3 
+ foo=&gt; \echo :var1 :var3
+ hello world!
+ </programlisting>
+         </para>
+         <para>
+          When this command fails, then related <replaceable
+          class="parameter">variables</replaceable> has undefined content.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 72,77 **** static void checkWin32Codepage(void);
--- 72,86 ----
  #endif
  
  
+ /*
+  * Possible states for simple state machine, that is used for
+  * parsing target list - list of varnames separated by comma.
+  */
+ typedef enum
+ {
+ 	VARLIST_EXPECTED_COMMA,
+ 	VARLIST_EXPECTED_COMMA_OR_IDENT
+ } VarlistParserState;
  
  /*----------
   * HandleSlashCmds:
***************
*** 748,753 **** exec_command(const char *cmd,
--- 757,861 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		char	   *packet;
+ 		VarlistParserState state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 
+ 		/* expected valid target list */
+ 		success = true;
+ 		pset.gvars = NULL;
+ 
+ 		/*
+ 		 * So we would to enable substitution, but we know so target varname
+ 		 * should not use comma. Recheck of variable name is done by variable
+ 		 * setting routine.  psql_scan_slash_option can returns zero or more
+ 		 * identifiers separated by comma. We cannot to use OT_WHOLE_LINE,
+ 		 * because variable substitution is not supported there.
+ 		 */
+ 		while ((packet = psql_scan_slash_option(scan_state,
+ 												OT_NORMAL, NULL, false)))
+ 		{
+ 			char	   *token = packet;
+ 			bool		process_comma = false;
+ 
+ 			while (success && (*token || process_comma))
+ 			{
+ 				if (process_comma)
+ 				{
+ 					if (state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						pset.gvars = tglist_add(pset.gvars, NULL);
+ 					state = VARLIST_EXPECTED_COMMA_OR_IDENT;
+ 					process_comma = false;
+ 				}
+ 				else
+ 				{
+ 					char	   *ptr = token;
+ 
+ 					/* search separator */
+ 					while (*ptr && *ptr != ',')
+ 						ptr++;
+ 
+ 					/* replace separator by zero char */
+ 					if (*ptr == ',')
+ 					{
+ 						process_comma = true;
+ 						*ptr = '\0';
+ 					}
+ 
+ 					/* process token when it is non empty string */
+ 					if (token != ptr)
+ 					{
+ 						if (state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 						{
+ 							pset.gvars = tglist_add(pset.gvars, token);
+ 							state = VARLIST_EXPECTED_COMMA;
+ 						}
+ 						else
+ 						{
+ 							success = false;
+ 							break;
+ 						}
+ 					}
+ 
+ 					/* move pointer to next token when comma is found */
+ 					if (process_comma)
+ 						token = ptr + 1;
+ 					else
+ 						/* leave when there are no next token */
+ 						break;
+ 				}
+ 			}
+ 			free(packet);
+ 		}
+ 
+ 		/* final check and target list completation */
+ 		if (pset.gvars != NULL)
+ 		{
+ 			if (success)
+ 			{
+ 				if (state == VARLIST_EXPECTED_COMMA_OR_IDENT)
+ 					pset.gvars = tglist_add(pset.gvars, NULL);
+ 				status = PSQL_CMD_SEND;
+ 			}
+ 			else
+ 			{
+ 				psql_error("\\%s: syntax error\n", cmd);
+ 				tglist_free(pset.gvars);
+ 				pset.gvars = NULL;
+ 				status = PSQL_CMD_NOSEND;
+ 
+ 			}
+ 		}
+ 		else
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 			status = PSQL_CMD_NOSEND;
+ 		}
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/command.h
--- b/src/bin/psql/command.h
***************
*** 16,21 **** typedef enum _backslashResult
--- 16,22 ----
  {
  	PSQL_CMD_UNKNOWN = 0,		/* not done parsing yet (internal only) */
  	PSQL_CMD_SEND,				/* query complete; send off */
+ 	PSQL_CMD_NOSEND,			/* query complete, don't send */
  	PSQL_CMD_SKIP_LINE,			/* keep building query */
  	PSQL_CMD_TERMINATE,			/* quit program */
  	PSQL_CMD_NEWEDIT,			/* query buffer was changed (e.g., via \e) */
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 818,823 **** PrintQueryResults(PGresult *results)
--- 818,938 ----
  
  
  /*
+  * StoreQueryTuple: assuming query result is OK, save first tuple
+  *
+  * Returns true if successful, false otherwise.
+  */
+ static bool
+ StoreQueryTuple(PGresult *result)
+ {
+ 	bool	success = true;
+ 
+ 	if (PQntuples(result) < 1)
+ 	{
+ 		psql_error("no data found\n");
+ 		success = false;
+ 	}
+ 	else if (PQntuples(result) > 1)
+ 	{
+ 		psql_error("too many rows\n");
+ 		success = false;
+ 	}
+ 	else
+ 	{
+ 		TargetListData *iter = (TargetListData *) pset.gvars;
+ 		int	i;
+ 
+ 		for (i = 0; i < PQnfields(result); i++)
+ 		{
+ 			if (!iter)
+ 			{
+ 				psql_error("too few target variables\n");
+ 				success = false;
+ 				break;
+ 			}
+ 
+ 			if (iter->name)
+ 			{
+ 				char	*value;
+ 
+ 				if (PQgetisnull(result, 0, i))
+ 					value = pset.popt.nullPrint ? pset.popt.nullPrint : "";
+ 				else
+ 					value = PQgetvalue(result, 0, i);
+ 
+ 				if (!SetVariable(pset.vars, iter->name, value))
+ 				{
+ 					psql_error("invalid variable name: \"%s\"\n",
+ 							   iter->name);
+ 					success = false;
+ 					break;
+ 				}
+ 			}
+ 
+ 			iter = iter->next;
+ 		}
+ 
+ 		if (success && iter != NULL)
+ 		{
+ 			psql_error("too many target variables\n");
+ 			success = false;
+ 		}
+ 	}
+ 
+ 	return success;
+ }
+ 
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			success = StoreQueryTuple(result);
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	tglist_free(pset.gvars);
+ 	pset.gvars = NULL;
+ 
+ 	return success;
+ }
+ 
+ /*
   * SendQuery: send the query string to the backend
   * (and print out results)
   *
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1058,1069 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvars)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1187,1193 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool		store_result = pset.gvars != NULL;
  
  	*elapsed_msec = 0;
  
***************
*** 1182,1188 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
  			did_pager = true;
  		}
  
! 		printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
--- 1303,1333 ----
  			did_pager = true;
  		}
  
! 		if (pset.gvars)
! 		{
! 			/* initial iteration when tartget are variables */
! 			OK = StoreQueryResult(results);
! 			if (!OK)
! 			{
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				break;
! 			}
! 		}
! 		else if (store_result)
! 		{
! 			/* must be second loop */
! 			if (ntuples > 0)
! 			{
! 				psql_error("too many rows\n");
! 				flush_error = fflush(pset.queryFout);
! 				PQclear(results);
! 				OK = false;
! 				break;
! 			}
! 		}
! 		else
! 			printQuery(results, &my_popt, pset.queryFout, pset.logfile);
  
  		PQclear(results);
  
***************
*** 1658,1660 **** expand_tilde(char **filename)
--- 1803,1855 ----
  
  	return *filename;
  }
+ 
+ 
+ /*
+  * Add name of internal variable to query target list
+  *
+  */
+ TargetList
+ tglist_add(TargetList tglist, const char *name)
+ {
+ 	TargetListData		*tgf;
+ 
+ 	tgf = pg_malloc(sizeof(TargetListData));
+ 	tgf->name = name ? pg_strdup(name) : NULL;
+ 	tgf->next = NULL;
+ 
+ 	if (tglist)
+ 	{
+ 		TargetListData *iter = (TargetListData *) tglist;
+ 
+ 		while (iter->next)
+ 			iter = iter->next;
+ 
+ 		iter->next = tgf;
+ 
+ 		return tglist;
+ 	}
+ 	else
+ 		return (TargetList) tgf;
+ }
+ 
+ /*
+  * Release target list
+  *
+  */
+ void
+ tglist_free(TargetList tglist)
+ {
+ 	TargetListData *iter = (TargetListData *) tglist;
+ 
+ 	while (iter)
+ 	{
+ 		TargetListData *next = iter->next;
+ 
+ 		if (iter->name)
+ 			free(iter->name);
+ 
+ 		free(iter);
+ 		iter = next;
+ 	}
+ }
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 14,19 ****
--- 14,27 ----
  
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
+ typedef struct _target_field
+ {
+ 	char	   *name;
+ 	struct _target_field *next;
+ } TargetListData;
+ 
+ typedef struct TargetListData *TargetList;
+ 
  /*
   * Safer versions of some standard C library functions. If an
   * out-of-memory condition occurs, these functions will bail out
***************
*** 55,58 **** extern const char *session_username(void);
--- 63,69 ----
  
  extern char *expand_tilde(char **filename);
  
+ extern TargetList  tglist_add(TargetList tglist, const char *name);
+ extern void tglist_free(TargetList tglist);
+ 
  #endif   /* COMMON_H */
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 162,174 **** slashUsage(unsigned short int pager)
  {
  	FILE	   *output;
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 162,175 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset NAME [, NAME [..]] execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/mainloop.c
--- b/src/bin/psql/mainloop.c
***************
*** 327,332 **** MainLoop(FILE *source)
--- 327,340 ----
  					/* flush any paren nesting info after forced send */
  					psql_scan_reset(scan_state);
  				}
+ 				else if (slashCmdStatus == PSQL_CMD_NOSEND)
+ 				{
+ 					resetPQExpBuffer(query_buf);
+ 					/* reset parsing state since we are rescanning whole line */
+ 					psql_scan_reset(scan_state);
+ 					line_saved_in_history = true;
+ 					success = false;
+ 				}
  				else if (slashCmdStatus == PSQL_CMD_NEWEDIT)
  				{
  					/* rescan query_buf as new input */
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 8,14 ****
  #ifndef SETTINGS_H
  #define SETTINGS_H
  
! 
  #include "variables.h"
  #include "print.h"
  
--- 8,14 ----
  #ifndef SETTINGS_H
  #define SETTINGS_H
  
! #include "common.h"
  #include "variables.h"
  #include "print.h"
  
***************
*** 73,78 **** typedef struct _psqlSettings
--- 73,79 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	TargetList  gvars;			/* one-shot target list argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,68 ----
+ -- \gset
+ select 10, 20, 'Hello';
+  ?column? | ?column? | ?column? 
+ ----------+----------+----------
+        10 |       20 | Hello
+ (1 row)
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello
+ select 10, 20, 'Hello World'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 10 20 Hello World
+ -- errors
+ \gset ,,
+ \gset ,
+ too few target variables
+ \gset ,,,
+ too many target variables
+ \gset
+ \gset: missing required argument
+ -- using badly varnames - detected when variable is accessed
+ -- note: row comments are not supported by psql lexer when command option
+ -- is read - so these statements finish by syntax error - not expected
+ -- "missing required argument" error.
+ \set --varname 10
+ \set: error while setting variable
+ \gset --varname1, varname2, varname3
+ invalid variable name: "--varname1"
+ \gset gset_test04,,
+ \echo :gset_test04
+ 10
+ \gset ,,gset_test05
+ \echo :gset_test05
+ Hello World
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 20
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ select 'a', 'b', 'c'
+ \gset gset_test01, gset_test02, gset_test03
+ \echo :gset_test01 :gset_test02 :gset_test03
+ a b c
+ select 1,2 \gset x,y \\ \echo :x
+ 1
+ select 1,2 \gset x,y \echo :x \echo :y
+ 1
+ 2
+ select 1,2 \gset x,y \\ \g \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ select 1,2 \g \gset x,y \echo :x :y
+  ?column? | ?column? 
+ ----------+----------
+         1 |        2
+ (1 row)
+ 
+ 1 2
+ \pset null '(null)'
+ select NULL \gset var1
+ \echo :var1
+ (null)
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 109,111 **** test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
--- 109,113 ----
  
  # run stats by itself because its delay may be insufficient under heavy load
  test: stats
+ 
+ test: psql_cmd
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 135,137 **** test: largeobject
--- 135,138 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,57 ----
+ -- \gset
+ 
+ select 10, 20, 'Hello';
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 10, 20, 'Hello World'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ -- errors
+ \gset ,,
+ \gset ,
+ \gset ,,,
+ \gset
+ 
+ -- using badly varnames - detected when variable is accessed
+ -- note: row comments are not supported by psql lexer when command option
+ -- is read - so these statements finish by syntax error - not expected
+ -- "missing required argument" error.
+ \set --varname 10
+ \gset --varname1, varname2, varname3
+ 
+ 
+ \gset gset_test04,,
+ \echo :gset_test04
+ 
+ \gset ,,gset_test05
+ \echo :gset_test05
+ 
+ \gset ,gset_test06 ,
+ \echo :gset_test06
+ 
+ -- should to work with cursor too
+ \set FETCH_COUNT 1
+ 
+ select 'a', 'b', 'c'
+ 
+ \gset gset_test01, gset_test02, gset_test03
+ 
+ \echo :gset_test01 :gset_test02 :gset_test03
+ 
+ select 1,2 \gset x,y \\ \echo :x
+ 
+ select 1,2 \gset x,y \echo :x \echo :y
+ 
+ select 1,2 \gset x,y \\ \g \echo :x :y
+ 
+ select 1,2 \g \gset x,y \echo :x :y
+ 
+ \pset null '(null)'
+ select NULL \gset var1
+ \echo :var1

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1648 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">prefix</replaceable></term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row. You can define <replaceable
+          class="parameter">prefix</replaceable>, that will be used as prefix
+          for target variables.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello' AS var1, 'wonderful' AS var2, 'world!' AS var3 \gset result_
+ foo=&gt; \echo :result_var1 :result_var3
+ hello world!
+ </programlisting>
+         </para>
+         <para>
+          When this command fails, then related <replaceable
+          class="parameter">variables</replaceable> has undefined content.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,767 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send a query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		char	   *prefix = psql_scan_slash_option(scan_state,
+ 												   OT_NORMAL, NULL, false);
+ 
+ 		if (!prefix)
+ 			pset.gvprefix = pg_strdup("");
+ 		else
+ 			pset.gvprefix = prefix;
+ 
+ 		status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 833,838 **** PrintQueryResults(PGresult *results)
--- 833,947 ----
  
  
  /*
+  * StoreQueryTuple: assuming query result is OK, save first tuple
+  *
+  * Returns true if successful, false otherwise.
+  */
+ static bool
+ StoreQueryTuple(PGresult *result)
+ {
+ 	bool	success = true;
+ 
+ 	if (PQntuples(result) < 1)
+ 	{
+ 		psql_error("no data found\n");
+ 		success = false;
+ 	}
+ 	else if (PQntuples(result) > 1)
+ 	{
+ 		psql_error("too many rows\n");
+ 		success = false;
+ 	}
+ 	else
+ 	{
+ 		int	i;
+ 
+ 		for (i = 0; i < PQnfields(result); i++)
+ 		{
+ 			char	*value;
+ 			char		*varname;
+ 			char		*colname = PQfname(result, i);
+ 
+ 			if (PQgetisnull(result, 0, i))
+ 				value = pset.popt.nullPrint ? pset.popt.nullPrint : "";
+ 			else
+ 				value = PQgetvalue(result, 0, i);
+ 
+ 			if (strcmp(pset.gvprefix, "") != 0)
+ 			{
+ 				/* concate prefix and column name */
+ 				varname = pg_malloc(strlen(pset.gvprefix) + strlen(colname) + 1);
+ 				strcpy(varname, pset.gvprefix);
+ 				strcat(varname, colname);
+ 			}
+ 			else
+ 				varname = pg_strdup(colname);
+ 
+ 			if (!SetVariable(pset.vars, varname, value))
+ 			{
+ 				psql_error("invalid variable name: \"%s\"\n",
+ 						   varname);
+ 				success = false;
+ 				break;
+ 			}
+ 
+ 			free(varname);
+ 		}
+ 	}
+ 
+ 	return success;
+ }
+ 
+ 
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			success = StoreQueryTuple(result);
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	return success;
+ }
+ 
+ 
+ /*
   * SendQuery: send the query string to the backend
   * (and print out results)
   *
***************
*** 958,964 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1067,1078 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvprefix)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1034,1039 **** SendQuery(const char *query)
--- 1148,1160 ----
  
  	PQclear(results);
  
+ 	/* clean gset prefix if was used */
+ 	if (pset.gvprefix)
+ 	{
+ 		free(pset.gvprefix);
+ 		pset.gvprefix = NULL;
+ 	}
+ 
  	/* Possible microtiming output */
  	if (pset.timing)
  		printf(_("Time: %.3f ms\n"), elapsed_msec);
***************
*** 1082,1087 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1203,1209 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool			first_iteration = true;
  
  	*elapsed_msec = 0;
  
***************
*** 1182,1187 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1304,1336 ----
  
  		ntuples = PQntuples(results);
  
+ 		if (pset.gvprefix)
+ 		{
+ 			/* second iteration should to return zero rows */
+ 			if (first_iteration)
+ 			{
+ 				OK = StoreQueryResult(results);
+ 				PQclear(results);
+ 				first_iteration = false;
+ 			}
+ 			else if (ntuples > 0)
+ 			{
+ 				psql_error("too many rows\n");
+ 				OK = false;
+ 			}
+ 
+ 			if (!OK)
+ 			{
+ 				flush_error = fflush(pset.queryFout);
+ 				break;
+ 			}
+ 
+ 			if (ntuples < pset.fetch_count || cancel_pressed)
+ 				break;
+ 			else
+ 				continue;
+ 		}
+ 
  		if (ntuples < pset.fetch_count)
  		{
  			/* this is the last result set, so allow footer decoration */
***************
*** 1237,1242 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1386,1396 ----
  		free(pset.gfname);
  		pset.gfname = NULL;
  	}
+ 	else if (pset.gvprefix)
+ 	{
+ 		free(pset.gvprefix);
+ 		pset.gvprefix = NULL;
+ 	}
  	else if (did_pager)
  	{
  		ClosePager(pset.queryFout);
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 165,177 **** slashUsage(unsigned short int pager)
  
  	currdb = PQdb(pset.db);
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 165,178 ----
  
  	currdb = PQdb(pset.db);
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset prefix           execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 73,78 **** typedef struct _psqlSettings
--- 73,79 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	char	   *gvprefix;			/* one-shot prefix argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,62 ----
+ -- \gset
+ select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
+ \echo :pref01_test01 :pref01_test02 :pref01_test03
+ 10 20 Hello
+ -- should fail bad name
+ select 10 as "bad name" \gset
+ invalid variable name: "bad name"
+ -- more in one line
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ 1
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ 3
+ 4
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  5 | 6
+ (1 row)
+ 
+ 5 6
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  7 | 8
+ (1 row)
+ 
+ 7 8
+ \pset null '(null)'
+ select NULL as var1 \gset pref01_
+ \echo :pref01_var1
+ (null)
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ too many rows
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ no data found
+ -- should to work with cursors
+ \set FETCH_COUNT 1
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ 1
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ 3
+ 4
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  5 | 6
+ (1 row)
+ 
+ 5 6
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  7 | 8
+ (1 row)
+ 
+ 7 8
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ too many rows
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ no data found
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 21,26 **** test: strings
--- 21,31 ----
  test: numerology
  
  # ----------
+ # verify console features
+ # ----------
+ test: psql_cmd
+ 
+ # ----------
  # The second group of parallel tests
  # ----------
  test: point lseg box path polygon circle date time timetz timestamp timestamptz interval abstime reltime tinterval inet macaddr tstypes comments
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 135,137 **** test: largeobject
--- 135,138 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,33 ----
+ -- \gset
+ 
+ select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
+ 
+ \echo :pref01_test01 :pref01_test02 :pref01_test03
+ 
+ -- should fail bad name
+ select 10 as "bad name" \gset
+ 
+ -- more in one line
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+ 
+ \pset null '(null)'
+ select NULL as var1 \gset pref01_
+ \echo :pref01_var1
+ 
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ 
+ -- should to work with cursors
+ \set FETCH_COUNT 1
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+ 
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_

*** a/doc/src/sgml/ref/psql-ref.sgml
--- b/doc/src/sgml/ref/psql-ref.sgml
***************
*** 1617,1622 **** Tue Oct 26 21:40:57 CEST 1999
--- 1617,1654 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\gset</literal> <replaceable class="parameter">prefix</replaceable></term>
+ 
+         <listitem>
+         <para>
+          Sends the current query input buffer to the server and stores the
+          query's output into corresponding <replaceable
+          class="parameter">variable</replaceable>.  The preceding query must
+          return only one row. You can define <replaceable
+          class="parameter">prefix</replaceable>, that will be used as prefix
+          for target variables.
+          Example:
+ <programlisting>
+ foo=&gt; SELECT 'hello' AS var1, 'wonderful' AS var2, 'world!' AS var3 \gset result_
+ foo=&gt; \echo :result_var1 :result_var3
+ hello world!
+ </programlisting>
+         </para>
+         <para>
+          When this command fails, then related <replaceable
+          class="parameter">variables</replaceable> has undefined content.
+         </para>
+         <para>
+          Assign <literal>NULL</literal> to target <replaceable
+          class="parameter">variable</replaceable> is same as cleaning this
+          <replaceable class="parameter">variable</replaceable>. Possible to use
+          coalesce as protection against to this behave.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+ 
+       <varlistentry>
          <term><literal>\h</literal> or <literal>\help</literal> <literal>[ <replaceable class="parameter">command</replaceable> ]</literal></term>
          <listitem>
          <para>
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 748,753 **** exec_command(const char *cmd,
--- 748,767 ----
  		status = PSQL_CMD_SEND;
  	}
  
+ 	/* \gset send a query and store result */
+ 	else if (strcmp(cmd, "gset") == 0)
+ 	{
+ 		char	   *prefix = psql_scan_slash_option(scan_state,
+ 												   OT_NORMAL, NULL, false);
+ 
+ 		if (!prefix)
+ 			pset.gvprefix = pg_strdup("");
+ 		else
+ 			pset.gvprefix = prefix;
+ 
+ 		status = PSQL_CMD_SEND;
+ 	}
+ 
  	/* help */
  	else if (strcmp(cmd, "h") == 0 || strcmp(cmd, "help") == 0)
  	{
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 818,823 **** PrintQueryResults(PGresult *results)
--- 818,950 ----
  
  
  /*
+  * StoreQueryTuple: assuming query result is OK, save first tuple
+  *
+  * Returns true if successful, false otherwise.
+  */
+ static bool
+ StoreQueryTuple(PGresult *result)
+ {
+ 	bool	success = true;
+ 
+ 	if (PQntuples(result) < 1)
+ 	{
+ 		psql_error("no data found\n");
+ 		success = false;
+ 	}
+ 	else if (PQntuples(result) > 1)
+ 	{
+ 		psql_error("too many rows\n");
+ 		success = false;
+ 	}
+ 	else
+ 	{
+ 		int	i;
+ 
+ 		for (i = 0; i < PQnfields(result); i++)
+ 		{
+ 			char		*varname;
+ 			char		*colname = PQfname(result, i);
+ 
+ 			if (strcmp(pset.gvprefix, "") != 0)
+ 			{
+ 				/* concate prefix and column name */
+ 				varname = pg_malloc(strlen(pset.gvprefix) + strlen(colname) + 1);
+ 				strcpy(varname, pset.gvprefix);
+ 				strcat(varname, colname);
+ 			}
+ 			else
+ 				varname = pg_strdup(colname);
+ 
+ 			if (!PQgetisnull(result, 0, i))
+ 			{
+ 				char *value = PQgetvalue(result, 0, i);
+ 
+ 				if (!SetVariable(pset.vars, varname, value))
+ 				{
+ 					psql_error("invalid variable name: \"%s\"\n",
+ 							   varname);
+ 					success = false;
+ 					break;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				/*
+ 				 * we don't try to substitute NULL by some other value - current
+ 				 * implementation of variables doesn't support NULL, so when some
+ 				 * result is NULL, then just clean a target variable. We still
+ 				 * request valid variable name.
+ 				 */
+ 				if (!valid_variable_name(varname))
+ 				{
+ 					psql_error("invalid variable name: \"%s\"\n",
+ 							   varname);
+ 					success = false;
+ 					break;
+ 				}
+ 
+ 				/* ignore result, variable should not exists */
+ 				DeleteVariable(pset.vars, varname);
+ 			}
+ 
+ 			free(varname);
+ 		}
+ 	}
+ 
+ 	return success;
+ }
+ 
+ 
+ /*
+  * StoreQueryResult: store first row of result to selected variables
+  *
+  * Note: Utility function for use by SendQuery() only.
+  *
+  * Returns true if the query executed successfully, false otherwise.
+  */
+ static bool
+ StoreQueryResult(PGresult *result)
+ {
+ 	bool success;
+ 
+ 	switch (PQresultStatus(result))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			success = StoreQueryTuple(result);
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error("no data found\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 			psql_error("COPY is not supported by \\gset command\n");
+ 			success = false;
+ 			break;
+ 
+ 		case PGRES_BAD_RESPONSE:
+ 		case PGRES_NONFATAL_ERROR:
+ 		case PGRES_FATAL_ERROR:
+ 			success = false;
+ 			psql_error("bad response\n");
+ 			break;
+ 
+ 		default:
+ 			success = false;
+ 			psql_error("unexpected PQresultStatus: %d\n",
+ 					   PQresultStatus(result));
+ 			break;
+ 	}
+ 
+ 	return success;
+ }
+ 
+ 
+ /*
   * SendQuery: send the query string to the backend
   * (and print out results)
   *
***************
*** 943,949 **** SendQuery(const char *query)
  
  		/* but printing results isn't: */
  		if (OK && results)
! 			OK = PrintQueryResults(results);
  	}
  	else
  	{
--- 1070,1081 ----
  
  		/* but printing results isn't: */
  		if (OK && results)
! 		{
! 			if (pset.gvprefix)
! 				OK = StoreQueryResult(results);
! 			else
! 				OK = PrintQueryResults(results);
! 		}
  	}
  	else
  	{
***************
*** 1019,1024 **** SendQuery(const char *query)
--- 1151,1163 ----
  
  	PQclear(results);
  
+ 	/* clean gset prefix if was used */
+ 	if (pset.gvprefix)
+ 	{
+ 		free(pset.gvprefix);
+ 		pset.gvprefix = NULL;
+ 	}
+ 
  	/* Possible microtiming output */
  	if (pset.timing)
  		printf(_("Time: %.3f ms\n"), elapsed_msec);
***************
*** 1067,1072 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1206,1212 ----
  	instr_time	before,
  				after;
  	int			flush_error;
+ 	bool			first_iteration = true;
  
  	*elapsed_msec = 0;
  
***************
*** 1167,1172 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1307,1339 ----
  
  		ntuples = PQntuples(results);
  
+ 		if (pset.gvprefix)
+ 		{
+ 			/* second iteration should to return zero rows */
+ 			if (first_iteration)
+ 			{
+ 				OK = StoreQueryResult(results);
+ 				PQclear(results);
+ 				first_iteration = false;
+ 			}
+ 			else if (ntuples > 0)
+ 			{
+ 				psql_error("too many rows\n");
+ 				OK = false;
+ 			}
+ 
+ 			if (!OK)
+ 			{
+ 				flush_error = fflush(pset.queryFout);
+ 				break;
+ 			}
+ 
+ 			if (ntuples < pset.fetch_count || cancel_pressed)
+ 				break;
+ 			else
+ 				continue;
+ 		}
+ 
  		if (ntuples < pset.fetch_count)
  		{
  			/* this is the last result set, so allow footer decoration */
***************
*** 1222,1227 **** ExecQueryUsingCursor(const char *query, double *elapsed_msec)
--- 1389,1399 ----
  		free(pset.gfname);
  		pset.gfname = NULL;
  	}
+ 	else if (pset.gvprefix)
+ 	{
+ 		free(pset.gvprefix);
+ 		pset.gvprefix = NULL;
+ 	}
  	else if (did_pager)
  	{
  		ClosePager(pset.queryFout);
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
***************
*** 165,177 **** slashUsage(unsigned short int pager)
  
  	currdb = PQdb(pset.db);
  
! 	output = PageOutput(94, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
--- 165,178 ----
  
  	currdb = PQdb(pset.db);
  
! 	output = PageOutput(95, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
  	fprintf(output, _("General\n"));
  	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
  	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+ 	fprintf(output, _("  \\gset prefix           execute query and store result in internal variables\n"));
  	fprintf(output, _("  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"));
  	fprintf(output, _("  \\q                     quit psql\n"));
  	fprintf(output, "\n");
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
***************
*** 73,78 **** typedef struct _psqlSettings
--- 73,79 ----
  	printQueryOpt popt;
  
  	char	   *gfname;			/* one-shot file output argument for \g */
+ 	char	   *gvprefix;			/* one-shot prefix argument for \gset */
  
  	bool		notty;			/* stdin or stdout is not a tty (as determined
  								 * on startup) */
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
***************
*** 856,862 **** psql_completion(char *text, int start, int end)
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
--- 856,862 ----
  		"\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL",
  		"\\dn", "\\do", "\\dp", "\\drds", "\\ds", "\\dS", "\\dt", "\\dT", "\\dv", "\\du",
  		"\\e", "\\echo", "\\ef", "\\encoding",
! 		"\\f", "\\g", "\\gset", "\\h", "\\help", "\\H", "\\i", "\\ir", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
  		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\sf", "\\t", "\\T",
*** a/src/bin/psql/variables.c
--- b/src/bin/psql/variables.c
***************
*** 18,24 ****
   * underscore.	Keep this in sync with the definition of variable_char in
   * psqlscan.l.
   */
! static bool
  valid_variable_name(const char *name)
  {
  	const unsigned char *ptr = (const unsigned char *) name;
--- 18,24 ----
   * underscore.	Keep this in sync with the definition of variable_char in
   * psqlscan.l.
   */
! bool
  valid_variable_name(const char *name)
  {
  	const unsigned char *ptr = (const unsigned char *) name;
*** a/src/bin/psql/variables.h
--- b/src/bin/psql/variables.h
***************
*** 48,53 **** int GetVariableNum(VariableSpace space,
--- 48,54 ----
  
  void		PrintVariables(VariableSpace space);
  
+ bool		valid_variable_name(const char *name);
  bool		SetVariable(VariableSpace space, const char *name, const char *value);
  bool		SetVariableAssignHook(VariableSpace space, const char *name, VariableAssignHook hook);
  bool		SetVariableBool(VariableSpace space, const char *name);
*** /dev/null
--- b/src/test/regress/expected/psql_cmd.out
***************
*** 0 ****
--- 1,67 ----
+ -- \gset
+ select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
+ \echo :pref01_test01 :pref01_test02 :pref01_test03
+ 10 20 Hello
+ -- should fail bad name
+ select 10 as "bad name" \gset
+ invalid variable name: "bad name"
+ select NULL as "bad name" \gset
+ invalid variable name: "bad name"
+ -- more in one line
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ 1
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ 3
+ 4
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  5 | 6
+ (1 row)
+ 
+ 5 6
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  7 | 8
+ (1 row)
+ 
+ 7 8
+ -- NULL handling
+ select 'Hello' as var1 \gset pref01_
+ \echo :pref01_var1
+ Hello
+ select NULL as var1 \gset pref01_
+ \echo :pref01_var1
+ :pref01_var1
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ too many rows
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ no data found
+ -- should to work with cursors
+ \set FETCH_COUNT 1
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ 1
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ 3
+ 4
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  5 | 6
+ (1 row)
+ 
+ 5 6
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+  x | y 
+ ---+---
+  7 | 8
+ (1 row)
+ 
+ 7 8
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ too many rows
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ no data found
*** a/src/test/regress/parallel_schedule
--- b/src/test/regress/parallel_schedule
***************
*** 21,26 **** test: strings
--- 21,31 ----
  test: numerology
  
  # ----------
+ # verify console features
+ # ----------
+ test: psql_cmd
+ 
+ # ----------
  # The second group of parallel tests
  # ----------
  test: point lseg box path polygon circle date time timetz timestamp timestamptz interval abstime reltime tinterval inet macaddr tstypes comments
*** a/src/test/regress/serial_schedule
--- b/src/test/regress/serial_schedule
***************
*** 135,137 **** test: largeobject
--- 135,138 ----
  test: with
  test: xml
  test: stats
+ test: psql_cmd
*** /dev/null
--- b/src/test/regress/sql/psql_cmd.sql
***************
*** 0 ****
--- 1,36 ----
+ -- \gset
+ 
+ select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
+ 
+ \echo :pref01_test01 :pref01_test02 :pref01_test03
+ 
+ -- should fail bad name
+ select 10 as "bad name" \gset
+ select NULL as "bad name" \gset
+ 
+ -- more in one line
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+ 
+ -- NULL handling
+ select 'Hello' as var1 \gset pref01_
+ \echo :pref01_var1
+ select NULL as var1 \gset pref01_
+ \echo :pref01_var1
+ 
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_
+ 
+ -- should to work with cursors
+ \set FETCH_COUNT 1
+ select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
+ select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
+ select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
+ select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
+ 
+ --should file - no returned one tuple
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) \gset pref01_
+ select 10 as test01, 20 as test02, 'Hello' as test03 from generate_series(1,3) where false \gset pref01_