Fix another small oversight in command_no_begin patch.

tglsfdc · tglsfdc · commit 112c3fc6db62 · 2010-09-28T14:50:39.000-04:00
Need a "return false" to prevent tests from continuing after we've moved
the "query" pointer.  As it stood, it'd accept "DROP DISCARD ALL" as a
match.
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -1386,6 +1386,7 @@ command_no_begin(const char *query)
 			return true;
 		if (wordlen == 10 && pg_strncasecmp(query, "tablespace", 10) == 0)
 			return true;
+		return false;
 	}
 
 	/* DISCARD ALL isn't allowed in xacts, but other variants are allowed. */
@@ -1401,6 +1402,7 @@ command_no_begin(const char *query)
 
 		if (wordlen == 3 && pg_strncasecmp(query, "all", 3) == 0)
 			return true;
+		return false;
 	}
 
 	return false;

Original file line number	Diff line number	Diff line change
`@@ -1386,6 +1386,7 @@ command_no_begin(const char *query)`
`1386`	`1386`	`return true;`
`1387`	`1387`	`if (wordlen == 10 && pg_strncasecmp(query, "tablespace", 10) == 0)`
`1388`	`1388`	`return true;`
	`1389`	`+ return false;`
`1389`	`1390`	`}`
`1390`	`1391`
`1391`	`1392`	`/* DISCARD ALL isn't allowed in xacts, but other variants are allowed. */`
`@@ -1401,6 +1402,7 @@ command_no_begin(const char *query)`
`1401`	`1402`
`1402`	`1403`	`if (wordlen == 3 && pg_strncasecmp(query, "all", 3) == 0)`
`1403`	`1404`	`return true;`
	`1405`	`+ return false;`
`1404`	`1406`	`}`
`1405`	`1407`
`1406`	`1408`	`return false;`