Skip to content

Commit df77ec5

Browse files
ChenHuajunChenHuajun
authored
Merge pull request #339 from oneofsunshine/master
from ref/alter_collation.sgml to ref/create_event_trigger.sgml
2 parents 9cc9566 + 936040b commit df77ec5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1046
-475
lines changed

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

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,24 +172,22 @@ ____________________________________________________________________________-->
172172
<!--==========================orignal english content==========================
173173
<para>
174174
Update the collation's version.
175-
See <xref linkend="sql-altercollation-notes"
176-
endterm="sql-altercollation-notes-title"/> below.
175+
See <xref linkend="sql-altercollation-notes"/> below.
177176
</para>
178177
____________________________________________________________________________-->
179178
<para>
180179
更新排序规则的版本。
181-
参阅下面的<xref linkend="sql-altercollation-notes"
182-
endterm="sql-altercollation-notes-title"/>。
180+
参阅下面的<xref linkend="sql-altercollation-notes"/>。
183181
</para>
184182
</listitem>
185183
</varlistentry>
186184
</variablelist>
187185
</refsect1>
188-
<refsect1 id="sql-altercollation-notes">
186+
<refsect1 id="sql-altercollation-notes" xreflabel="Notes">
189187
<!--==========================orignal english content==========================
190-
<title id="sql-altercollation-notes-title">Notes</title>
188+
<title>Notes</title>
191189
____________________________________________________________________________-->
192-
<title id="sql-altercollation-notes-title">注意</title>
190+
<title>注意</title>
193191

194192
<!--==========================orignal english content==========================
195193
<para>
@@ -234,6 +232,28 @@ HINT: Rebuild all objects affected by this collation and run ALTER COLLATION pg
234232
这将更新系统目录以记录当前的排序规则版本，并会使警告消失。请注意，
235233
这实际上并不检查是否所有受影响的对象都已正确重建。
236234
</para>
235+
<!--==========================orignal english content==========================
236+
<para>
237+
When using collations provided by <literal>libc</literal> and
238+
<productname>PostgreSQL</productname> was built with the GNU C library, the
239+
C library's version is used as a collation version. Since collation
240+
definitions typically change only with GNU C library releases, this provides
241+
some defense against corruption, but it is not completely reliable.
242+
</para>
243+
____________________________________________________________________________-->
244+
<pare>
245+
使用 <literal>libc</literal> 提供的排序规则，并且 <productname>PostgreSQL</productname>
246+
是使用GNU C库构建的，则将C库的版本用作排序规则版本。由于排序规则定义通常仅随GNU C库发行版而更改，
247+
因此可以提供一些防止损坏的防御措施，但它并不是完全可靠的。
248+
</pare>
249+
<!--==========================orignal english content==========================
250+
<para>
251+
Currently, there is no version tracking for the database default collation.
252+
</para>
253+
____________________________________________________________________________-->
254+
<pare>
255+
当前，没有针对数据库默认排序规则的版本跟踪。
256+
</pare>
237257

238258
<!--==========================orignal english content==========================
239259
<para>
@@ -246,8 +266,7 @@ SELECT pg_describe_object(refclassid, refobjid, refobjsubid) AS "Collation",
246266
ON refclassid = 'pg_collation'::regclass AND refobjid = c.oid
247267
WHERE c.collversion <> pg_collation_actual_version(c.oid)
248268
ORDER BY 1, 2;
249-
]]></programlisting>
250-
</para>
269+
]]></programlisting></para>
251270
____________________________________________________________________________-->
252271
<para>
253272
以下查询可用于识别当前数据库中需要刷新的所有排序规则以及依赖它们的对象：
@@ -258,8 +277,7 @@ SELECT pg_describe_object(refclassid, refobjid, refobjsubid) AS "Collation",
258277
ON refclassid = 'pg_collation'::regclass AND refobjid = c.oid
259278
WHERE c.collversion <> pg_collation_actual_version(c.oid)
260279
ORDER BY 1, 2;
261-
]]></programlisting>
262-
</para>
280+
]]></programlisting></para>
263281
</refsect1>
264282

265283
<refsect1>

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
4949
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
5050
SET SCHEMA <replaceable>new_schema</replaceable>
5151
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
52-
DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
52+
[ NO ] DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
5353

5454
<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
5555

@@ -76,7 +76,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
7676
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
7777
SET SCHEMA <replaceable>new_schema</replaceable>
7878
ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
79-
DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
79+
[ NO ] DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
8080

8181
<phrase>其中 <replaceable class="parameter">action</replaceable> 是以下之一：</phrase>
8282

@@ -153,7 +153,7 @@ ____________________________________________________________________________-->
153153
____________________________________________________________________________-->
154154
<para>
155155
一个现有函数的名称（可以被模式限定）。如果没有指定参数列表，
156-
则该名称必须在它的模式中唯一。
156+
则该名称必须在它的模式中唯一。
157157
</para>
158158
</listitem>
159159
</varlistentry>
@@ -285,17 +285,23 @@ ____________________________________________________________________________-->
285285

286286
<varlistentry>
287287
<!--==========================orignal english content==========================
288-
<term><replaceable class="parameter">extension_name</replaceable></term>
288+
<term><literal>DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
289+
<term><literal>NO DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
289290
____________________________________________________________________________-->
290-
<term><replaceable class="parameter">extension_name</replaceable></term>
291+
<term><literal>DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
292+
<term><literal>NO DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
291293
<listitem>
292294
<!--==========================orignal english content==========================
293295
<para>
294-
The name of the extension that the function is to depend on.
296+
This form marks the function as dependent on the extension, or no longer
297+
dependent on that extension if <literal>NO</literal> is specified.
298+
A function that's marked as dependent on an extension is automatically
299+
dropped when the extension is dropped.
295300
</para>
296301
____________________________________________________________________________-->
297302
<para>
298-
该函数所以来的扩展名。
303+
此格式将功能标记为依赖于扩展名，或者如果指定了<literal>NO</literal> ，则不再依赖于该扩展名。
304+
删除扩展名后，会自动删除标记为依赖于扩展名的功能。
299305
</para>
300306
</listitem>
301307
</varlistentry>

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENA
4444
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
4545
ALTER INDEX <replaceable class="parameter">name</replaceable> ATTACH PARTITION <replaceable class="parameter">index_name</replaceable>
4646
ALTER INDEX <replaceable class="parameter">name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable>
47-
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
47+
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
4848
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
4949
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable>
5050
SET STATISTICS <replaceable class="parameter">integer</replaceable>
@@ -57,7 +57,7 @@ ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENA
5757
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
5858
ALTER INDEX <replaceable class="parameter">name</replaceable> ATTACH PARTITION <replaceable class="parameter">index_name</replaceable>
5959
ALTER INDEX <replaceable class="parameter">name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable>
60-
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
60+
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
6161
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
6262
ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable>
6363
SET STATISTICS <replaceable class="parameter">integer</replaceable>
@@ -136,17 +136,20 @@ ____________________________________________________________________________-->
136136
</varlistentry>
137137

138138
<varlistentry>
139-
<term><literal>DEPENDS ON EXTENSION</literal></term>
139+
<term><literal>DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
140+
<term><literal>NO DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
140141
<listitem>
141142
<para>
142-
This form marks the index as dependent on the extension, such that if the
143-
extension is dropped, the index will automatically be dropped as well.
143+
This form marks the index as dependent on the extension, or no longer
144+
dependent on that extension if <literal>NO</literal> is specified.
145+
An index that's marked as dependent on an extension is automatically
146+
dropped when the extension is dropped.
144147
</para>
145148
</listitem>
146149
</varlistentry>
147150

148151
<varlistentry>
149-
<term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
152+
<term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term>
150153
<listitem>
151154
<para>
152155
This form changes one or more index-method-specific storage parameters
@@ -242,17 +245,17 @@ ____________________________________________________________________________-->
242245
</varlistentry>
243246

244247
<varlistentry>
245-
<term><literal>DEPENDS ON EXTENSION</literal></term>
248+
<term><literal>DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
249+
<term><literal>NO DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable></literal></term>
246250
<listitem>
247251
<para>
248-
这种形式把该索引标记为依赖于扩展，这样如果该扩展被删除，该索引也将被
249-
自动删除。
252+
这种形式将索引标记为依赖于扩展，或者如果指定了 <literal>NO</literal> ，则不再依赖于该扩展名。标记为依赖于扩展名的索引会在删除扩展名时自动删除。
250253
</para>
251254
</listitem>
252255
</varlistentry>
253256

254257
<varlistentry>
255-
<term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
258+
<term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term>
256259
<listitem>
257260
<para>
258261
这种形式为该索引更改一个或者多个索引方法相关的存储参数。可用的参数详见

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
6161
ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
6262
CLUSTER ON <replaceable class="parameter">index_name</replaceable>
6363
SET WITHOUT CLUSTER
64-
SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
64+
SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
6565
RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
6666
OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
6767
</synopsis>
@@ -88,7 +88,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
8888
ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
8989
CLUSTER ON <replaceable class="parameter">index_name</replaceable>
9090
SET WITHOUT CLUSTER
91-
SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
91+
SET ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
9292
RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
9393
OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
9494
</synopsis>
@@ -132,18 +132,6 @@ ____________________________________________________________________________-->
132132
能做一些通过删除和重建该物化视图做不到的事情。不过，一个超级用户怎么都能更改
133133
任何视图的所有权。）。
134134
</para>
135-
136-
<!--==========================orignal english content==========================
137-
<para>
138-
The <literal>DEPENDS ON EXTENSION</literal> form marks the materialized view
139-
as dependent on an extension, such that the materialized view will
140-
automatically be dropped if the extension is dropped.
141-
</para>
142-
____________________________________________________________________________-->
143-
<para>
144-
<literal>DEPENDS ON EXTENSION</literal>形式把该物化视图标记为依赖于一个
145-
扩展，这样该扩展被删除时会自动地删除掉这个物化视图。
146-
</para>
147135

148136
<!--==========================orignal english content==========================
149137
<para>
@@ -211,11 +199,15 @@ ____________________________________________________________________________-->
211199
<listitem>
212200
<!--==========================orignal english content==========================
213201
<para>
214-
The name of the extension that the materialized view is to depend on.
202+
The name of the extension that the materialized view is to depend on (or no longer
203+
dependent on, if <literal>NO</literal> is specified). A materialized view
204+
that's marked as dependent on an extension is automatically dropped when
205+
the extension is dropped.
215206
</para>
216207
____________________________________________________________________________-->
217208
<para>
218-
该物化视图所依赖的扩展的名称。
209+
该物化视图所依赖的扩展的名称（如果指定了 <literal>NO</literal> ，则不再依赖）。
210+
删除扩展时，会自动删除标记为依赖于扩展的实例化视图。
219211
</para>
220212
</listitem>
221213
</varlistentry>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,19 @@ ____________________________________________________________________________-->
284284
and hash functions it is not necessary to specify <replaceable
285285
class="parameter">op_type</replaceable> since the function's input
286286
data type(s) are always the correct ones to use. For B-tree sort
287-
support functions and all functions in GiST, SP-GiST and GIN operator
288-
classes, it is necessary to specify the operand data type(s) the function
289-
is to be used with.
287+
support functions, B-Tree equal image functions, and all
288+
functions in GiST, SP-GiST and GIN operator classes, it is
289+
necessary to specify the operand data type(s) the function is to
290+
be used with.
290291
</para>
291292
____________________________________________________________________________-->
292293
<para>
293294
在一个<literal>ADD FUNCTION</literal>子句中指定该函数意图支持的操作数
294295
数据类型（如果不同于该函数的输入数据类型）。对于 B-树比较函数和哈希
295296
函数，有必要指定<replaceable
296297
class="parameter">op_type</replaceable>，因为该函数的输入数据类型
297-
总是正确的。对于 B-树排序支持函数和 GiST、SP-GiST 和 GIN 操作符类中
298-
的所有函数，有必要指定该函数要使用的操作数数据类型。
298+
总是正确的。对于B树排序支持功能，B树相等的图像函数以及GiST，SP-GiST和
299+
GIN运算符类中的所有函数，必须指定要与该函数一起使用的操作数数据类型。
299300
</para>
300301

301302
<!--==========================orignal english content==========================
@@ -375,7 +376,7 @@ ____________________________________________________________________________-->
375376
____________________________________________________________________________-->
376377
<para>
377378
作为该操作符族的一种索引方法支持函数的函数名称（可以是模式限定的）。
378-
如果没有指定参数列表，则该名称必须在其模式中唯一。
379+
如果没有指定参数列表，则该名称必须在其模式中唯一。
379380
</para>
380381
</listitem>
381382
</varlistentry>

0 commit comments

Comments
 (0)