Wording quibbles regarding initdb username

sfrost · sfrost · commit 6f69b96390ed · 2016-05-08T12:58:21.000-04:00
Use disallowed instead of reserved, cannot instead of can not, and
double quotes instead of single quotes.

Also add a test to cover the bug which started this discussion.

Per discussion with Tom.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -3564,7 +3564,7 @@ main(int argc, char *argv[])
 
 	if (strncmp(username, "pg_", 3) == 0)
 	{
-		fprintf(stderr, _("%s: superuser name \"%s\" is reserved; role names can not begin with 'pg_'\n"), progname, username);
+		fprintf(stderr, _("%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"), progname, username);
 		exit(1);
 	}
 
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
@@ -6,7 +6,7 @@
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 14;
+use Test::More tests => 15;
 
 my $tempdir = TestLib::tempdir;
 my $xlogdir = "$tempdir/pgxlog";
@@ -29,6 +29,10 @@
 	[ 'initdb', '-X', 'pgxlog', $datadir ],
 	'relative xlog directory not allowed');
 
+command_fails(
+	[ 'initdb', '-U', 'pg_test', $datadir ],
+	'role names cannot being with "pg_"');
+
 mkdir $datadir;
 command_ok([ 'initdb', '-N', '-T', 'german', '-X', $xlogdir, $datadir ],
 	'successful creation');

Original file line number	Diff line number	Diff line change
`@@ -3564,7 +3564,7 @@ main(int argc, char *argv[])`
`3564`	`3564`
`3565`	`3565`	`if (strncmp(username, "pg_", 3) == 0)`
`3566`	`3566`	`{`
`3567`		`- fprintf(stderr, _("%s: superuser name \"%s\" is reserved; role names can not begin with 'pg_'\n"), progname, username);`
	`3567`	`+ fprintf(stderr, _("%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"), progname, username);`
`3568`	`3568`	`exit(1);`
`3569`	`3569`	`}`
`3570`	`3570`