summaryrefslogtreecommitdiffstats
path: root/src/bin/pg_dump
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/pg_dump')
-rw-r--r--src/bin/pg_dump/pg_dumpall.c17
-rw-r--r--src/bin/pg_dump/po/es.po2
-rw-r--r--src/bin/pg_dump/po/ru.po40
3 files changed, 31 insertions, 28 deletions
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 7e639f9..950bc41 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -736,28 +736,31 @@ dumpRoles(PGconn *conn)
i_is_current_user;
int i;
- /* note: rolconfig is dumped later */
+ /*
+ * Notes: rolconfig is dumped later, and pg_authid must be used for
+ * extracting rolcomment regardless of role_catalog.
+ */
if (server_version >= 90600)
printfPQExpBuffer(buf,
"SELECT oid, rolname, rolsuper, rolinherit, "
"rolcreaterole, rolcreatedb, "
"rolcanlogin, rolconnlimit, rolpassword, "
"rolvaliduntil, rolreplication, rolbypassrls, "
- "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+ "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
"rolname = current_user AS is_current_user "
"FROM %s "
"WHERE rolname !~ '^pg_' "
- "ORDER BY 2", role_catalog, role_catalog);
+ "ORDER BY 2", role_catalog);
else if (server_version >= 90500)
printfPQExpBuffer(buf,
"SELECT oid, rolname, rolsuper, rolinherit, "
"rolcreaterole, rolcreatedb, "
"rolcanlogin, rolconnlimit, rolpassword, "
"rolvaliduntil, rolreplication, rolbypassrls, "
- "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+ "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
"rolname = current_user AS is_current_user "
"FROM %s "
- "ORDER BY 2", role_catalog, role_catalog);
+ "ORDER BY 2", role_catalog);
else
printfPQExpBuffer(buf,
"SELECT oid, rolname, rolsuper, rolinherit, "
@@ -765,10 +768,10 @@ dumpRoles(PGconn *conn)
"rolcanlogin, rolconnlimit, rolpassword, "
"rolvaliduntil, rolreplication, "
"false as rolbypassrls, "
- "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+ "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
"rolname = current_user AS is_current_user "
"FROM %s "
- "ORDER BY 2", role_catalog, role_catalog);
+ "ORDER BY 2", role_catalog);
res = executeQuery(conn, buf->data);
diff --git a/src/bin/pg_dump/po/es.po b/src/bin/pg_dump/po/es.po
index 237b44f..035d9d9 100644
--- a/src/bin/pg_dump/po/es.po
+++ b/src/bin/pg_dump/po/es.po
@@ -1589,7 +1589,7 @@ msgstr " --no-subscriptions no volcar las suscripciones\n"
#: pg_dump.c:1041 pg_dumpall.c:640
#, c-format
msgid " --no-table-access-method do not dump table access methods\n"
-msgstr " --no-tablespaces no volcar métodos de acceso de tablas\n"
+msgstr " --no-table-access-method no volcar métodos de acceso de tablas\n"
#: pg_dump.c:1042 pg_dumpall.c:641
#, c-format
diff --git a/src/bin/pg_dump/po/ru.po b/src/bin/pg_dump/po/ru.po
index c0dd159..7b0c0a9 100644
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_dump (PostgreSQL current)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:11+0300\n"
+"POT-Creation-Date: 2024-05-04 10:36+0300\n"
"PO-Revision-Date: 2023-08-30 14:18+0300\n"
"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -1035,12 +1035,12 @@ msgstr "сжатие активно"
msgid "could not get server_version from libpq"
msgstr "не удалось получить версию сервера из libpq"
-#: pg_backup_db.c:53 pg_dumpall.c:1646
+#: pg_backup_db.c:53 pg_dumpall.c:1649
#, c-format
msgid "aborting because of server version mismatch"
msgstr "продолжение работы с другой версией сервера невозможно"
-#: pg_backup_db.c:54 pg_dumpall.c:1647
+#: pg_backup_db.c:54 pg_dumpall.c:1650
#, c-format
msgid "server version: %s; %s version: %s"
msgstr "версия сервера: %s; версия %s: %s"
@@ -1050,7 +1050,7 @@ msgstr "версия сервера: %s; версия %s: %s"
msgid "already connected to a database"
msgstr "подключение к базе данных уже установлено"
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1490 pg_dumpall.c:1595
+#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1493 pg_dumpall.c:1598
msgid "Password: "
msgstr "Пароль: "
@@ -1065,17 +1065,17 @@ msgid "reconnection failed: %s"
msgstr "переподключиться не удалось: %s"
#: pg_backup_db.c:190 pg_backup_db.c:265 pg_dump_sort.c:1280
-#: pg_dump_sort.c:1300 pg_dumpall.c:1520 pg_dumpall.c:1604
+#: pg_dump_sort.c:1300 pg_dumpall.c:1523 pg_dumpall.c:1607
#, c-format
msgid "%s"
msgstr "%s"
-#: pg_backup_db.c:272 pg_dumpall.c:1709 pg_dumpall.c:1732
+#: pg_backup_db.c:272 pg_dumpall.c:1712 pg_dumpall.c:1735
#, c-format
msgid "query failed: %s"
msgstr "ошибка при выполнении запроса: %s"
-#: pg_backup_db.c:274 pg_dumpall.c:1710 pg_dumpall.c:1733
+#: pg_backup_db.c:274 pg_dumpall.c:1713 pg_dumpall.c:1736
#, c-format
msgid "Query was: %s"
msgstr "Выполнялся запрос: %s"
@@ -1878,7 +1878,7 @@ msgstr ""
msgid "invalid output format \"%s\" specified"
msgstr "указан неверный формат вывода: \"%s\""
-#: pg_dump.c:1332 pg_dump.c:1388 pg_dump.c:1441 pg_dumpall.c:1282
+#: pg_dump.c:1332 pg_dump.c:1388 pg_dump.c:1441 pg_dumpall.c:1285
#, c-format
msgid "improper qualified name (too many dotted names): %s"
msgstr "неверное полное имя (слишком много компонентов): %s"
@@ -2441,7 +2441,7 @@ msgid ""
"options -r/--roles-only and -t/--tablespaces-only cannot be used together"
msgstr "параметры -r/--roles-only и -t/--tablespaces-only исключают друг друга"
-#: pg_dumpall.c:444 pg_dumpall.c:1587
+#: pg_dumpall.c:444 pg_dumpall.c:1590
#, c-format
msgid "could not connect to database \"%s\""
msgstr "не удалось подключиться к базе данных: \"%s\""
@@ -2552,59 +2552,59 @@ msgstr ""
"вывод.\n"
"\n"
-#: pg_dumpall.c:803
+#: pg_dumpall.c:806
#, c-format
msgid "role name starting with \"pg_\" skipped (%s)"
msgstr "имя роли, начинающееся с \"pg_\", пропущено (%s)"
-#: pg_dumpall.c:1018
+#: pg_dumpall.c:1021
#, c-format
msgid "could not parse ACL list (%s) for parameter \"%s\""
msgstr "не удалось разобрать список ACL (%s) для параметра \"%s\""
-#: pg_dumpall.c:1136
+#: pg_dumpall.c:1139
#, c-format
msgid "could not parse ACL list (%s) for tablespace \"%s\""
msgstr ""
"не удалось разобрать список управления доступом (%s) для табл. пространства "
"\"%s\""
-#: pg_dumpall.c:1343
+#: pg_dumpall.c:1346
#, c-format
msgid "excluding database \"%s\""
msgstr "база данных \"%s\" исключается"
-#: pg_dumpall.c:1347
+#: pg_dumpall.c:1350
#, c-format
msgid "dumping database \"%s\""
msgstr "выгрузка базы данных \"%s\""
-#: pg_dumpall.c:1378
+#: pg_dumpall.c:1381
#, c-format
msgid "pg_dump failed on database \"%s\", exiting"
msgstr "ошибка при обработке базы \"%s\", pg_dump завершается"
-#: pg_dumpall.c:1384
+#: pg_dumpall.c:1387
#, c-format
msgid "could not re-open the output file \"%s\": %m"
msgstr "не удалось повторно открыть выходной файл \"%s\": %m"
-#: pg_dumpall.c:1425
+#: pg_dumpall.c:1428
#, c-format
msgid "running \"%s\""
msgstr "выполняется \"%s\""
-#: pg_dumpall.c:1630
+#: pg_dumpall.c:1633
#, c-format
msgid "could not get server version"
msgstr "не удалось узнать версию сервера"
-#: pg_dumpall.c:1633
+#: pg_dumpall.c:1636
#, c-format
msgid "could not parse server version \"%s\""
msgstr "не удалось разобрать строку версии сервера \"%s\""
-#: pg_dumpall.c:1703 pg_dumpall.c:1726
+#: pg_dumpall.c:1706 pg_dumpall.c:1729
#, c-format
msgid "executing %s"
msgstr "выполняется %s"