Wording quibbles regarding initdb username

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
index 7dedd8adc63b3aa2263ae2c5b3e702de0bc44a49..ec8c38ed5a44f8a235bbeaa72efbcaa645b81066 100644 (file)
--- 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
index f64186d6373a5148fdee570b1458044f5864fa17..8cf762a19cce04ac1ffa256a02818f342571f033 100644 (file)
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -6,7 +6,7 @@ use strict;
 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 @@ command_fails(
        [ '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');