Add code to preserve paren level display after \g, as submitted months ago.

bmomjian · bmomjian · commit fb8e3f15c095 · 2002-02-18T05:57:41.000Z
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.45 2001/12/28 05:01:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.46 2002/02/18 05:57:41 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -447,7 +447,6 @@ MainLoop(FILE *source)
 			{
 				const char *end_of_cmd = NULL;
 
-				paren_level = 0;
 				line[i - prevlen] = '\0';		/* overwrites backslash */
 
 				/* is there anything else on the line for the command? */
@@ -473,7 +472,7 @@ MainLoop(FILE *source)
 				if ((slashCmdStatus == CMD_SEND || slashCmdStatus == CMD_NEWEDIT) &&
 					query_buf->len == 0)
 				{
-					/* copy previous buffer to current for for handling */
+					/* copy previous buffer to current for handling */
 					appendPQExpBufferStr(query_buf, previous_buf->data);
 				}
 
@@ -487,6 +486,9 @@ MainLoop(FILE *source)
 					resetPQExpBuffer(query_buf);
 				}
 
+				if (query_buf->len == 0 && previous_buf->len == 0)
+					paren_level = 0;
+
 				/* process anything left after the backslash command */
 				i += end_of_cmd - &line[i];
 				query_start = i;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.45 2001/12/28 05:01:05 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.46 2002/02/18 05:57:41 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "mainloop.h"`
`@@ -447,7 +447,6 @@ MainLoop(FILE *source)`
`447`	`447`	`{`
`448`	`448`	`const char *end_of_cmd = NULL;`
`449`	`449`
`450`		`- paren_level = 0;`
`451`	`450`	`line[i - prevlen] = '\0'; /* overwrites backslash */`
`452`	`451`
`453`	`452`	`/* is there anything else on the line for the command? */`
`@@ -473,7 +472,7 @@ MainLoop(FILE *source)`
`473`	`472`	`if ((slashCmdStatus == CMD_SEND \|\| slashCmdStatus == CMD_NEWEDIT) &&`
`474`	`473`	`query_buf->len == 0)`
`475`	`474`	`{`
`476`		`- /* copy previous buffer to current for for handling */`
	`475`	`+ /* copy previous buffer to current for handling */`
`477`	`476`	`appendPQExpBufferStr(query_buf, previous_buf->data);`
`478`	`477`	`}`
`479`	`478`
`@@ -487,6 +486,9 @@ MainLoop(FILE *source)`
`487`	`486`	`resetPQExpBuffer(query_buf);`
`488`	`487`	`}`
`489`	`488`
	`489`	`+ if (query_buf->len == 0 && previous_buf->len == 0)`
	`490`	`+ paren_level = 0;`
	`491`	`+`
`490`	`492`	`/* process anything left after the backslash command */`
`491`	`493`	`i += end_of_cmd - &line[i];`
`492`	`494`	`query_start = i;`