mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish SQL/MED terminology

Browse Source
This commit is contained in:
Peter Eisentraut 2009-03-25 13:11:43 +00:00
parent ac79586bb2
commit 3e90346628
2 changed files with 14 additions and 14 deletions
src
bin/psql
describe.c
test/regress/expected
foreign_data.out

10
src/bin/psql/describe.c

@ -8,7 +8,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * Copyright (c) 2000-2009, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.201 2009/02/24 10:06:34 petere Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.202 2009/03/25 13:11:43 petere Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -2933,7 +2933,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
/* /*
* \des * \des
* *
* Describes foreign-data servers. * Describes foreign servers.
*/ */
bool bool
listForeignServers(const char *pattern, bool verbose) listForeignServers(const char *pattern, bool verbose)
@ -2944,7 +2944,7 @@ listForeignServers(const char *pattern, bool verbose)
if (pset.sversion < 80400) if (pset.sversion < 80400)
{ {
fprintf(stderr, _("The server (version %d.%d) does not support foreign-data servers.\n"), fprintf(stderr, _("The server (version %d.%d) does not support foreign servers.\n"),
pset.sversion / 10000, (pset.sversion / 100) % 100); pset.sversion / 10000, (pset.sversion / 100) % 100);
return true; return true;
} }
@ -3010,7 +3010,7 @@ listUserMappings(const char *pattern, bool verbose)
if (pset.sversion < 80400) if (pset.sversion < 80400)
{ {
fprintf(stderr, _("The server (version %d.%d) does not support foreign-data user mappings.\n"), fprintf(stderr, _("The server (version %d.%d) does not support user mappings.\n"),
pset.sversion / 10000, (pset.sversion / 100) % 100); pset.sversion / 10000, (pset.sversion / 100) % 100);
return true; return true;
} }
@ -3020,7 +3020,7 @@ listUserMappings(const char *pattern, bool verbose)
"SELECT um.srvname AS \"%s\",\n" "SELECT um.srvname AS \"%s\",\n"
" um.usename AS \"%s\"", " um.usename AS \"%s\"",
gettext_noop("Server"), gettext_noop("Server"),
gettext_noop("Username")); gettext_noop("User name"));
if (verbose) if (verbose)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,

18
src/test/regress/expected/foreign_data.out

@ -230,7 +230,7 @@ CREATE USER MAPPING FOR current_user SERVER s1;
\deu+ \deu+
List of user mappings List of user mappings
Server | Username | Options Server | User name | Options
--------+-------------------+--------- --------+-------------------+---------
s1 | foreign_data_user | s1 | foreign_data_user |
(1 row) (1 row)
@ -265,8 +265,8 @@ drop cascades to user mapping for foreign_data_user
\deu+ \deu+
List of user mappings List of user mappings
Server | Username | Options Server | User name | Options
--------+----------+--------- --------+-----------+---------
(0 rows) (0 rows)
-- exercise CREATE SERVER -- exercise CREATE SERVER
@ -493,7 +493,7 @@ RESET ROLE;
CREATE USER MAPPING FOR current_user SERVER s3; CREATE USER MAPPING FOR current_user SERVER s3;
\deu \deu
List of user mappings List of user mappings
Server | Username Server | User name
--------+------------------- --------+-------------------
s3 | foreign_data_user s3 | foreign_data_user
(1 row) (1 row)
@ -519,8 +519,8 @@ NOTICE: drop cascades to user mapping for foreign_data_user
\deu \deu
List of user mappings List of user mappings
Server | Username Server | User name
--------+---------- --------+-----------
(0 rows) (0 rows)
-- CREATE USER MAPPING -- CREATE USER MAPPING
@ -553,7 +553,7 @@ CREATE USER MAPPING FOR public SERVER t1;
RESET ROLE; RESET ROLE;
\deu \deu
List of user mappings List of user mappings
Server | Username Server | User name
--------+------------------- --------+-------------------
s4 | foreign_data_user s4 | foreign_data_user
s4 | public s4 | public
@ -583,7 +583,7 @@ ALTER USER MAPPING FOR public SERVER t1 OPTIONS (ADD modified '1');
RESET ROLE; RESET ROLE;
\deu+ \deu+
List of user mappings List of user mappings
Server | Username | Options Server | User name | Options
--------+-------------------+----------------------------- --------+-------------------+-----------------------------
s4 | foreign_data_user | s4 | foreign_data_user |
s4 | public | {"mapping=is public"} s4 | public | {"mapping=is public"}
@ -615,7 +615,7 @@ RESET ROLE;
DROP SERVER s7; DROP SERVER s7;
\deu \deu
List of user mappings List of user mappings
Server | Username Server | User name
--------+------------------- --------+-------------------
s4 | foreign_data_user s4 | foreign_data_user
s4 | public s4 | public