Skip to content

Commit 4cd7f0c

Browse files
zuyuezuyue
committed
417
1 parent a21767e commit 4cd7f0c

26 files changed

+1830
-408
lines changed

‎postgresql/doc/src/sgml/ref/alter_user.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WIT
5252
| REPLICATION | NOREPLICATION
5353
| BYPASSRLS | NOBYPASSRLS
5454
| CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
55-
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
55+
| [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
5656
| VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
5757

5858
ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
5959

60-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
61-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
62-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET <replaceable>configuration_parameter</replaceable>
63-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET ALL
60+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
61+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
62+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
63+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL
6464

6565
<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
6666

67-
[ GROUP ] <replaceable class="PARAMETER">role_name</replaceable>
67+
<replaceable class="PARAMETER">role_name</replaceable>
6868
| CURRENT_USER
6969
| SESSION_USER
7070
</synopsis>
@@ -82,19 +82,19 @@ ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WIT
8282
| REPLICATION | NOREPLICATION
8383
| BYPASSRLS | NOBYPASSRLS
8484
| CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
85-
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
85+
| [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
8686
| VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
8787

8888
ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
8989

90-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
91-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
92-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET <replaceable>configuration_parameter</replaceable>
93-
ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> RESET ALL
90+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
91+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
92+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
93+
ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL
9494

9595
<phrase>其中 <replaceable class="PARAMETER">role_specification</replaceable> 可以是：</phrase>
9696

97-
[ GROUP ] <replaceable class="PARAMETER">role_name</replaceable>
97+
<replaceable class="PARAMETER">role_name</replaceable>
9898
| CURRENT_USER
9999
| SESSION_USER
100100
</synopsis>

‎postgresql/doc/src/sgml/ref/analyze.sgml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,17 @@ ____________________________________________________________________________-->
114114
<!--==========================orignal english content==========================
115115
<para>
116116
The name (possibly schema-qualified) of a specific table to
117-
analyze. If omitted, all regular tables (but not foreign tables)
118-
in the current database are analyzed.
117+
analyze. If omitted, all regular tables, partitioned tables, and
118+
materialized views in the current database are analyzed (but not
119+
foreign tables). If the specified table is a partitioned table, both the
120+
inheritance statistics of the partitioned table as a whole and
121+
statistics of the individual partitions are updated.
119122
</para>
120123
____________________________________________________________________________-->
121124
<para>
122-
要分析的一个指定表的名称（可以是模式限定的）。如果省略，当前数据库中所有常规表（非外部表）都会被分析。
125+
要分析的一个指定表的名称（可以是模式限定的）。如果省略，
126+
当前数据库中所有常规表、分区表和物化视图都会被分析（但不包括外部表）。
127+
如果指定的表是分区表，则分区表的继承统计信息以及各个分区的统计信息都会更新。
123128
</para>
124129
</listitem>
125130
</varlistentry>

‎postgresql/doc/src/sgml/ref/comment.sgml

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ COMMENT ON
5656
EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> |
5757
FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> |
5858
FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> |
59-
FUNCTION <replaceable class="PARAMETER">function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) |
59+
FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
6060
INDEX <replaceable class="PARAMETER">object_name</replaceable> |
6161
LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> |
6262
MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> |
@@ -65,11 +65,14 @@ COMMENT ON
6565
OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
6666
POLICY <replaceable class="PARAMETER">policy_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
6767
[ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> |
68+
PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> |
6869
ROLE <replaceable class="PARAMETER">object_name</replaceable> |
6970
RULE <replaceable class="PARAMETER">rule_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
7071
SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
7172
SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
7273
SERVER <replaceable class="PARAMETER">object_name</replaceable> |
74+
STATISTICS <replaceable class="PARAMETER">object_name</replaceable> |
75+
SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> |
7376
TABLE <replaceable class="PARAMETER">object_name</replaceable> |
7477
TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> |
7578
TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> |
@@ -131,6 +134,48 @@ COMMENT ON
131134
TYPE <replaceable class="PARAMETER">object_name</replaceable> |
132135
VIEW <replaceable class="PARAMETER">object_name</replaceable>
133136
} IS '<replaceable class="PARAMETER">text</replaceable>'
137+
ACCESS METHOD <replaceable class="PARAMETER">object_name</replaceable> |
138+
AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
139+
CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
140+
COLLATION <replaceable class="PARAMETER">object_name</replaceable> |
141+
COLUMN <replaceable class="PARAMETER">relation_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
142+
CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
143+
CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON DOMAIN <replaceable class="PARAMETER">domain_name</replaceable> |
144+
CONVERSION <replaceable class="PARAMETER">object_name</replaceable> |
145+
DATABASE <replaceable class="PARAMETER">object_name</replaceable> |
146+
DOMAIN <replaceable class="PARAMETER">object_name</replaceable> |
147+
EXTENSION <replaceable class="PARAMETER">object_name</replaceable> |
148+
EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> |
149+
FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> |
150+
FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> |
151+
FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
152+
INDEX <replaceable class="PARAMETER">object_name</replaceable> |
153+
LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> |
154+
MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> |
155+
OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) |
156+
OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
157+
OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
158+
POLICY <replaceable class="PARAMETER">policy_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
159+
[ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> |
160+
PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> |
161+
ROLE <replaceable class="PARAMETER">object_name</replaceable> |
162+
RULE <replaceable class="PARAMETER">rule_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
163+
SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
164+
SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
165+
SERVER <replaceable class="PARAMETER">object_name</replaceable> |
166+
STATISTICS <replaceable class="PARAMETER">object_name</replaceable> |
167+
SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> |
168+
TABLE <replaceable class="PARAMETER">object_name</replaceable> |
169+
TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> |
170+
TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> |
171+
TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
172+
TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
173+
TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
174+
TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
175+
TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
176+
TYPE <replaceable class="PARAMETER">object_name</replaceable> |
177+
VIEW <replaceable class="PARAMETER">object_name</replaceable>
178+
} IS '<replaceable class="PARAMETER">text</replaceable>'
134179

135180
<phrase>其中 <replaceable>aggregate_signature</replaceable> 是：</phrase>
136181

@@ -260,15 +305,15 @@ ____________________________________________________________________________-->
260305
The name of the object to be commented. Names of tables,
261306
aggregates, collations, conversions, domains, foreign tables, functions,
262307
indexes, operators, operator classes, operator families, sequences,
263-
text search objects, types, and views can be schema-qualified.
264-
When commenting on a column,
308+
statistics, text search objects, types, and views can be
309+
schema-qualified. When commenting on a column,
265310
<replaceable class="parameter">relation_name</replaceable> must refer
266311
to a table, view, composite type, or foreign table.
267312
</para>
268313
____________________________________________________________________________-->
269314
<para>
270315
要被注释的对象的名称。表、聚集、排序方式、转换、域、外部表、函数、
271-
索引、操作符、操作符类、操作符族、序列、文本搜索对象、类型和视图
316+
索引、操作符、操作符类、操作符族、序列、统计信息、文本搜索对象、类型和视图
272317
的名称可以被模式限定。在注释一列时，
273318
<replaceable class="parameter">relation_name</replaceable>必须
274319
引用一个表、视图、组合类型或者外部表。
@@ -612,6 +657,7 @@ COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
612657
COMMENT ON SCHEMA my_schema IS 'Departmental data';
613658
COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys';
614659
COMMENT ON SERVER myserver IS 'my foreign server';
660+
COMMENT ON STATISTICS my_statistics IS 'Improves planner row estimations';
615661
COMMENT ON TABLE my_schema.my_table IS 'Employee Information';
616662
COMMENT ON TABLESPACE my_tablespace IS 'Tablespace for indexes';
617663
COMMENT ON TEXT SEARCH CONFIGURATION my_config IS 'Special word filtering';
@@ -656,6 +702,7 @@ COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
656702
COMMENT ON SCHEMA my_schema IS 'Departmental data';
657703
COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys';
658704
COMMENT ON SERVER myserver IS 'my foreign server';
705+
COMMENT ON STATISTICS my_statistics IS 'Improves planner row estimations';
659706
COMMENT ON TABLE my_schema.my_table IS 'Employee Information';
660707
COMMENT ON TABLESPACE my_tablespace IS 'Tablespace for indexes';
661708
COMMENT ON TEXT SEARCH CONFIGURATION my_config IS 'Special word filtering';

‎postgresql/doc/src/sgml/ref/copy.sgml

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -739,15 +739,28 @@ ____________________________________________________________________________-->
739739

740740
<!--==========================orignal english content==========================
741741
<para>
742-
<command>COPY</command> can only be used with plain tables, not
742+
<command>COPY TO</command> can only be used with plain tables, not
743743
with views. However, you can write <literal>COPY (SELECT * FROM
744-
<replaceable class="parameter">viewname</replaceable>) TO ...</literal>.
744+
<replaceable class="parameter">viewname</replaceable>) TO ...</literal>
745+
to copy the current contents of a view.
745746
</para>
746747
____________________________________________________________________________-->
747748
<para>
748-
<command>COPY</command>只能被用于纯粹的表，不能用于视图。
749+
<command>COPY TO</command>只能被用于纯粹的表，不能用于视图。
749750
不过你可以写<literal>COPY (SELECT * FROM
750-
<replaceable class="parameter">viewname</replaceable>) TO ...</literal>。
751+
<replaceable class="parameter">viewname</replaceable>) TO ...</literal>
752+
拷贝一个视图的当前内容。
753+
</para>
754+
755+
<!--==========================orignal english content==========================
756+
<para>
757+
<command>COPY FROM</command> can be used with plain tables and with views
758+
that have <literal>INSTEAD OF INSERT</> triggers.
759+
</para>
760+
____________________________________________________________________________-->
761+
<para>
762+
<command>COPY FROM</command>可以被用于纯粹的表和具有
763+
<literal>INSTEAD OF INSERT</>触发器的视图。
751764
</para>
752765

753766
<!--==========================orignal english content==========================
@@ -786,6 +799,23 @@ ____________________________________________________________________________-->
786799
拥有在命令中列出的列上的特权就足够了。
787800
</para>
788801

802+
<!--==========================orignal english content==========================
803+
<para>
804+
If row-level security is enabled for the table, the relevant
805+
<command>SELECT</command> policies will apply to <literal>COPY
806+
<replaceable class="parameter">table</> TO</literal> statements.
807+
Currently, <command>COPY FROM</command> is not supported for tables
808+
with row-level security. Use equivalent <command>INSERT</command>
809+
statements instead.
810+
</para>
811+
____________________________________________________________________________-->
812+
<para>
813+
如果对表启用行级安全性，则相关的<command>SELECT</command>
814+
策略将应用于<literal>COPY <replaceable class="parameter">table</> TO</literal>语句。
815+
目前，具有行级安全性的表不支持<command>COPY FROM</command>。
816+
改为使用等效的<command>INSERT</command>语句。
817+
</para>
818+
789819
<!--==========================orignal english content==========================
790820
<para>
791821
Files named in a <command>COPY</command> command are read or written
@@ -880,6 +910,19 @@ ____________________________________________________________________________-->
880910
和检查约束。但是它不会调用规则。
881911
</para>
882912

913+
<!--==========================orignal english content==========================
914+
<para>
915+
For identity columns, the <command>COPY FROM</command> command will always
916+
write the column values provided in the input data, like
917+
the <command>INSERT</command> option <literal>OVERRIDING SYSTEM
918+
VALUE</literal>.
919+
</para>
920+
____________________________________________________________________________-->
921+
<para>
922+
对于标识列，<command>COPY FROM</command>命令将始终写入输入数据中提供的列值，
923+
就像<command>INSERT</command>选项<literal>OVERRIDING SYSTEM VALUE</literal>。
924+
</para>
925+
883926
<!--==========================orignal english content==========================
884927
<para>
885928
<command>COPY</command> input and output is affected by

‎postgresql/doc/src/sgml/ref/create_access_method.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,13 @@ ____________________________________________________________________________-->
167167
handler function <literal>heptree_handler</>:
168168
<programlisting>
169169
CREATE ACCESS METHOD heptree TYPE INDEX HANDLER heptree_handler;
170-
</programlisting>
171-
</para>
170+
</programlisting></para>
172171
____________________________________________________________________________-->
173172
<para>
174173
用处理器函数<literal>heptree_handler</>创建一种索引访问方法<literal>heptree</>：
175174
<programlisting>
176175
CREATE ACCESS METHOD heptree TYPE INDEX HANDLER heptree_handler;
177-
</programlisting>
178-
</para>
176+
</programlisting></para>
179177
</refsect1>
180178

181179
<refsect1>

0 commit comments

Comments
 (0)