summaryrefslogtreecommitdiffstats
path: root/src/bin/psql/sql_help.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 05:05:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 05:05:26 +0000
commite75d99818dd3940be997520e64db8c9e3b207e39 (patch)
tree0003ca0de74fcc8d18433e34ea68d2e7aaf06b7c /src/bin/psql/sql_help.c
parentReleasing progress-linux version 15.6-0+deb12u1~progress6.99u1. (diff)
downloadpostgresql-15-e75d99818dd3940be997520e64db8c9e3b207e39.tar.xz
postgresql-15-e75d99818dd3940be997520e64db8c9e3b207e39.zip
Merging upstream version 15.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/bin/psql/sql_help.c')
-rw-r--r--src/bin/psql/sql_help.c30
1 files changed, 21 insertions, 9 deletions
diff --git a/src/bin/psql/sql_help.c b/src/bin/psql/sql_help.c
index 4c5e883..e88cd28 100644
--- a/src/bin/psql/sql_help.c
+++ b/src/bin/psql/sql_help.c
@@ -162,7 +162,8 @@ sql_help_ALTER_DEFAULT_PRIVILEGES(PQExpBuffer buf)
" ON TYPES\n"
" TO { [ GROUP ] %s | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
"\n"
- "GRANT { USAGE | CREATE | ALL [ PRIVILEGES ] }\n"
+ "GRANT { { USAGE | CREATE }\n"
+ " [, ...] | ALL [ PRIVILEGES ] }\n"
" ON SCHEMAS\n"
" TO { [ GROUP ] %s | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
"\n"
@@ -193,7 +194,8 @@ sql_help_ALTER_DEFAULT_PRIVILEGES(PQExpBuffer buf)
" [ CASCADE | RESTRICT ]\n"
"\n"
"REVOKE [ GRANT OPTION FOR ]\n"
- " { USAGE | CREATE | ALL [ PRIVILEGES ] }\n"
+ " { { USAGE | CREATE }\n"
+ " [, ...] | ALL [ PRIVILEGES ] }\n"
" ON SCHEMAS\n"
" FROM { [ GROUP ] %s | PUBLIC } [, ...]\n"
" [ CASCADE | RESTRICT ]",
@@ -1299,7 +1301,7 @@ sql_help_ALTER_TABLE(PQExpBuffer buf)
"\n"
"%s\n"
"\n"
- "{ %s | ( %s ) } [ %s ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
+ "{ %s | ( %s ) } [ COLLATE %s ] [ %s [ ( %s = %s [, ... ] ) ] ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
"\n"
"%s\n"
"\n"
@@ -1425,7 +1427,10 @@ sql_help_ALTER_TABLE(PQExpBuffer buf)
_("exclude_element in an EXCLUDE constraint is:"),
_("column_name"),
_("expression"),
+ _("collation"),
_("opclass"),
+ _("opclass_parameter"),
+ _("value"),
_("referential_action in a FOREIGN KEY/REFERENCES constraint is:"),
_("column_name"),
_("column_name"));
@@ -2181,7 +2186,7 @@ sql_help_CREATE_DATABASE(PQExpBuffer buf)
" [ WITH ] [ OWNER [=] %s ]\n"
" [ TEMPLATE [=] %s ]\n"
" [ ENCODING [=] %s ]\n"
- " [ STRATEGY [=] %s ] ]\n"
+ " [ STRATEGY [=] %s ]\n"
" [ LOCALE [=] %s ]\n"
" [ LC_COLLATE [=] %s ]\n"
" [ LC_CTYPE [=] %s ]\n"
@@ -2877,7 +2882,7 @@ sql_help_CREATE_TABLE(PQExpBuffer buf)
"\n"
"%s\n"
"\n"
- "{ %s | ( %s ) } [ %s ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
+ "{ %s | ( %s ) } [ COLLATE %s ] [ %s [ ( %s = %s [, ... ] ) ] ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
"\n"
"%s\n"
"\n"
@@ -2971,7 +2976,10 @@ sql_help_CREATE_TABLE(PQExpBuffer buf)
_("exclude_element in an EXCLUDE constraint is:"),
_("column_name"),
_("expression"),
+ _("collation"),
_("opclass"),
+ _("opclass_parameter"),
+ _("value"),
_("referential_action in a FOREIGN KEY/REFERENCES constraint is:"),
_("column_name"),
_("column_name"));
@@ -4058,7 +4066,9 @@ sql_help_MERGE(PQExpBuffer buf)
"%s\n"
"\n"
"UPDATE SET { %s = { %s | DEFAULT } |\n"
- " ( %s [, ...] ) = ( { %s | DEFAULT } [, ...] ) } [, ...]\n"
+ " ( %s [, ...] ) = [ ROW ] ( { %s | DEFAULT } [, ...] ) |\n"
+ " ( %s [, ...] ) = ( %s )\n"
+ " } [, ...]\n"
"\n"
"%s\n"
"\n"
@@ -4087,6 +4097,8 @@ sql_help_MERGE(PQExpBuffer buf)
_("expression"),
_("column_name"),
_("expression"),
+ _("column_name"),
+ _("sub-SELECT"),
_("and merge_delete is:"));
}
@@ -4424,7 +4436,7 @@ sql_help_SECURITY_LABEL(PQExpBuffer buf)
" DATABASE %s |\n"
" DOMAIN %s |\n"
" EVENT TRIGGER %s |\n"
- " FOREIGN TABLE %s\n"
+ " FOREIGN TABLE %s |\n"
" FUNCTION %s [ ( [ [ %s ] [ %s ] %s [, ...] ] ) ] |\n"
" LARGE OBJECT %s |\n"
" MATERIALIZED VIEW %s |\n"
@@ -5157,7 +5169,7 @@ const struct _helpStruct QL_HELP[] = {
N_("define default access privileges"),
"sql-alterdefaultprivileges",
sql_help_ALTER_DEFAULT_PRIVILEGES,
- 59},
+ 61},
{"ALTER DOMAIN",
N_("change the definition of a domain"),
@@ -6045,7 +6057,7 @@ const struct _helpStruct QL_HELP[] = {
N_("conditionally insert, update, or delete rows of a table"),
"sql-merge",
sql_help_MERGE,
- 27},
+ 29},
{"MOVE",
N_("position a cursor"),