Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3e90346

Browse files
committed
Polish SQL/MED terminology
1 parent ac79586 commit 3e90346

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/bin/psql/describe.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
1010
*
11-
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.201 2009/02/24 10:06:34 petere Exp $
11+
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.202 2009/03/25 13:11:43 petere Exp $
1212
*/
1313
#include "postgres_fe.h"
1414

@@ -2933,7 +2933,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
29332933
/*
29342934
* \des
29352935
*
2936-
* Describes foreign-data servers.
2936+
* Describes foreign servers.
29372937
*/
29382938
bool
29392939
listForeignServers(const char *pattern, bool verbose)
@@ -2944,7 +2944,7 @@ listForeignServers(const char *pattern, bool verbose)
29442944

29452945
if (pset.sversion < 80400)
29462946
{
2947-
fprintf(stderr, _("The server (version %d.%d) does not support foreign-data servers.\n"),
2947+
fprintf(stderr, _("The server (version %d.%d) does not support foreign servers.\n"),
29482948
pset.sversion / 10000, (pset.sversion / 100) % 100);
29492949
return true;
29502950
}
@@ -3010,7 +3010,7 @@ listUserMappings(const char *pattern, bool verbose)
30103010

30113011
if (pset.sversion < 80400)
30123012
{
3013-
fprintf(stderr, _("The server (version %d.%d) does not support foreign-data user mappings.\n"),
3013+
fprintf(stderr, _("The server (version %d.%d) does not support user mappings.\n"),
30143014
pset.sversion / 10000, (pset.sversion / 100) % 100);
30153015
return true;
30163016
}
@@ -3020,7 +3020,7 @@ listUserMappings(const char *pattern, bool verbose)
30203020
"SELECT um.srvname AS \"%s\",\n"
30213021
" um.usename AS \"%s\"",
30223022
gettext_noop("Server"),
3023-
gettext_noop("Username"));
3023+
gettext_noop("User name"));
30243024

30253025
if (verbose)
30263026
appendPQExpBuffer(&buf,

src/test/regress/expected/foreign_data.out

+9-9
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ CREATE USER MAPPING FOR current_user SERVER s1;
230230

231231
\deu+
232232
List of user mappings
233-
Server | Username | Options
233+
Server | User name | Options
234234
--------+-------------------+---------
235235
s1 | foreign_data_user |
236236
(1 row)
@@ -265,8 +265,8 @@ drop cascades to user mapping for foreign_data_user
265265

266266
\deu+
267267
List of user mappings
268-
Server | Username | Options
269-
--------+----------+---------
268+
Server | User name | Options
269+
--------+-----------+---------
270270
(0 rows)
271271

272272
-- exercise CREATE SERVER
@@ -493,7 +493,7 @@ RESET ROLE;
493493
CREATE USER MAPPING FOR current_user SERVER s3;
494494
\deu
495495
List of user mappings
496-
Server | Username
496+
Server | User name
497497
--------+-------------------
498498
s3 | foreign_data_user
499499
(1 row)
@@ -519,8 +519,8 @@ NOTICE: drop cascades to user mapping for foreign_data_user
519519

520520
\deu
521521
List of user mappings
522-
Server | Username
523-
--------+----------
522+
Server | User name
523+
--------+-----------
524524
(0 rows)
525525

526526
-- CREATE USER MAPPING
@@ -553,7 +553,7 @@ CREATE USER MAPPING FOR public SERVER t1;
553553
RESET ROLE;
554554
\deu
555555
List of user mappings
556-
Server | Username
556+
Server | User name
557557
--------+-------------------
558558
s4 | foreign_data_user
559559
s4 | public
@@ -583,7 +583,7 @@ ALTER USER MAPPING FOR public SERVER t1 OPTIONS (ADD modified '1');
583583
RESET ROLE;
584584
\deu+
585585
List of user mappings
586-
Server | Username | Options
586+
Server | User name | Options
587587
--------+-------------------+-----------------------------
588588
s4 | foreign_data_user |
589589
s4 | public | {"mapping=is public"}
@@ -615,7 +615,7 @@ RESET ROLE;
615615
DROP SERVER s7;
616616
\deu
617617
List of user mappings
618-
Server | Username
618+
Server | User name
619619
--------+-------------------
620620
s4 | foreign_data_user
621621
s4 | public

0 commit comments

Comments
 (0)