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

tglsfdc · tglsfdc · commit bd74c4037c4e · 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
@@ -5474,13 +5474,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
`@@ -5474,13 +5474,13 @@ valid_custom_variable_name(const char *name)`
`5474`	`5474`	`name_start = true;`
`5475`	`5475`	`}`
`5476`	`5476`	`else if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ"`
`5477`		`- "abcdefghijklmnopqrstuvwxyz", *p) != NULL \|\|`
	`5477`	`+ "abcdefghijklmnopqrstuvwxyz_", *p) != NULL \|\|`
`5478`	`5478`	`IS_HIGHBIT_SET(*p))`
`5479`	`5479`	`{`
`5480`	`5480`	`/* okay as first or non-first character */`
`5481`	`5481`	`name_start = false;`
`5482`	`5482`	`}`
`5483`		`- else if (!name_start && strchr("0123456789_$", *p) != NULL)`
	`5483`	`+ else if (!name_start && strchr("0123456789$", *p) != NULL)`
`5484`	`5484`	`/* okay as non-first character */ ;`
`5485`	`5485`	`else`
`5486`	`5486`	`return false;`