postgrespro
diff --git a/‎src/backend/utils/activity/generate-wait_event_types.pl
Lines changed: 5 additions & 3 deletions b/‎src/backend/utils/activity/generate-wait_event_types.pl
Lines changed: 5 additions & 3 deletions
@@ -73,7 +73,7 @@
 foreach my $line (@lines_sorted)
 {
 	die "unable to parse wait_event_names.txt"
-	  unless $line =~ /^(\w+)\t+(\w+)\t+("\w+")\t+("\w.*\.")$/;
+	  unless $line =~ /^(\w+)\t+(\w+)\t+(\w+)\t+("\w.*\.")$/;
 
 	(   my $waitclassname,
 		my $waiteventenumname,
@@ -168,7 +168,9 @@
 			$firstpass = 0;
 
 			printf $c "\t\t case %s:\n", $wev->[0];
-			printf $c "\t\t\t event_name = %s;\n\t\t\t break;\n", $wev->[1];
+			# Apply quotes to the wait event name string.
+			printf $c "\t\t\t event_name = \"%s\";\n\t\t\t break;\n",
+			  $wev->[1];
 		}
 
 		printf $h "\n} $waitclass;\n\n";
@@ -221,7 +223,7 @@
 		{
 			printf $s "     <row>\n";
 			printf $s "      <entry><literal>%s</literal></entry>\n",
-			  substr $wev->[1], 1, -1;
+			  $wev->[1];
 			printf $s "      <entry>%s</entry>\n", substr $wev->[2], 1, -1;
 			printf $s "     </row>\n";
 		}
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`foreach my $line (@lines_sorted)`
`74`	`74`	`{`
`75`	`75`	`die "unable to parse wait_event_names.txt"`
`76`		`- unless $line =~ /^(\w+)\t+(\w+)\t+("\w+")\t+("\w.*\.")$/;`
	`76`	`+ unless $line =~ /^(\w+)\t+(\w+)\t+(\w+)\t+("\w.*\.")$/;`
`77`	`77`
`78`	`78`	`( my $waitclassname,`
`79`	`79`	`my $waiteventenumname,`
`@@ -168,7 +168,9 @@`
`168`	`168`	`$firstpass = 0;`
`169`	`169`
`170`	`170`	`printf $c "\t\t case %s:\n", $wev->[0];`
`171`		`- printf $c "\t\t\t event_name = %s;\n\t\t\t break;\n", $wev->[1];`
	`171`	`+ # Apply quotes to the wait event name string.`
	`172`	`+ printf $c "\t\t\t event_name = \"%s\";\n\t\t\t break;\n",`
	`173`	`+ $wev->[1];`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`printf $h "\n} $waitclass;\n\n";`
`@@ -221,7 +223,7 @@`
`221`	`223`	`{`
`222`	`224`	`printf $s " <row>\n";`
`223`	`225`	`printf $s " <entry><literal>%s</literal></entry>\n",`
`224`		`- substr $wev->[1], 1, -1;`
	`226`	`+ $wev->[1];`
`225`	`227`	`printf $s " <entry>%s</entry>\n", substr $wev->[2], 1, -1;`
`226`	`228`	`printf $s " </row>\n";`
`227`	`229`	`}`