Re-allow underscore as first character of custom GUC names.

tglsfdc · tglsfdc · commit dd7c0597918a · 2022-02-23T11:10:46.000-05:00
Commit 3db826b intended that valid_custom_variable_name's rules for valid identifiers match those of scan.l. However, I (tgl) had some kind of brain fade and put "_" in the wrong list. Fix by Japin Li, per bug #17415 from Daniel Polski. Discussion: https://postgr.es/m/17415-ebdb683d7e09a51c@postgresql.org
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -5390,13 +5390,13 @@ valid_custom_variable_name(const char *name)
 			name_start = true;
 		}
 		else if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-						"abcdefghijklmnopqrstuvwxyz", *p) != NULL ||
+						"abcdefghijklmnopqrstuvwxyz_", *p) != NULL ||
 				 IS_HIGHBIT_SET(*p))
 		{
 			/* okay as first or non-first character */
 			name_start = false;
 		}
-		else if (!name_start && strchr("0123456789_$", *p) != NULL)
+		else if (!name_start && strchr("0123456789$", *p) != NULL)
 			 /* okay as non-first character */ ;
 		else
 			return false;

Original file line number	Diff line number	Diff line change
`@@ -5390,13 +5390,13 @@ valid_custom_variable_name(const char *name)`
`5390`	`5390`	`name_start = true;`
`5391`	`5391`	`}`
`5392`	`5392`	`else if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ"`
`5393`		`- "abcdefghijklmnopqrstuvwxyz", *p) != NULL \|\|`
	`5393`	`+ "abcdefghijklmnopqrstuvwxyz_", *p) != NULL \|\|`
`5394`	`5394`	`IS_HIGHBIT_SET(*p))`
`5395`	`5395`	`{`
`5396`	`5396`	`/* okay as first or non-first character */`
`5397`	`5397`	`name_start = false;`
`5398`	`5398`	`}`
`5399`		`- else if (!name_start && strchr("0123456789_$", *p) != NULL)`
	`5399`	`+ else if (!name_start && strchr("0123456789$", *p) != NULL)`
`5400`	`5400`	`/* okay as non-first character */ ;`
`5401`	`5401`	`else`
`5402`	`5402`	`return false;`