Merge pull request #282 from jingsam/alter_foregin_table

alter_foregin_table

Author: ChenHuajun

postgresql/doc/src/sgml/ref/alter_foreign_table.sgml

@@ -69,7 +69,6 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab
     ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
     ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable>
     ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable>
-    SET WITH OIDS
     SET WITHOUT OIDS
     INHERIT <replaceable class="parameter">parent_table</replaceable>
     NO INHERIT <replaceable class="parameter">parent_table</replaceable>
@@ -107,7 +106,6 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab
     ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
     ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable>
     ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable>
-    SET WITH OIDS
     SET WITHOUT OIDS
     INHERIT <replaceable class="parameter">parent_table</replaceable>
     NO INHERIT <replaceable class="parameter">parent_table</replaceable>
@@ -284,34 +282,13 @@ ____________________________________________________________________________-->
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><literal>SET WITH OIDS</literal></term>
-    <listitem>
-     <para>
-      This form adds an <literal>oid</literal> system column to the
-      table (see <xref linkend="ddl-system-columns"/>).
-      It does nothing if the table already has OIDs.
-      Unless the table's foreign-data wrapper supports OIDs, this column
-      will simply read as zeroes.
-     </para>
-
-     <para>
-      Note that this is not equivalent to <literal>ADD COLUMN oid oid</literal>;
-      that would add a normal column that happened to be named
-      <literal>oid</literal>, not a system column.
-     </para>
-    </listitem>
-   </varlistentry>
-
    <varlistentry>
     <term><literal>SET WITHOUT OIDS</literal></term>
     <listitem>
      <para>
-      This form removes the <literal>oid</literal> system column from the
-      table.  This is exactly equivalent to
-      <literal>DROP COLUMN oid RESTRICT</literal>,
-      except that it will not complain if there is already no
-      <literal>oid</literal> column.
+      Backward compatibility syntax for removing the <literal>oid</literal>
+      system column. As <literal>oid</literal> system columns cannot be added
+      anymore, this never has an effect.
      </para>
     </listitem>
    </varlistentry>
@@ -464,7 +441,7 @@ ____________________________________________________________________________-->
      </para>
     </listitem>
    </varlistentry>
-   
+
    <varlistentry>
     <term>
      <literal>SET STORAGE</literal>
@@ -529,32 +506,13 @@ ____________________________________________________________________________-->
      </para>
     </listitem>
    </varlistentry>
-   
-   <varlistentry>
-    <term><literal>SET WITH OIDS</literal></term>
-    <listitem>
-     <para>
-      这种形式为表增加一个<literal>oid</literal>系统列（见
-      <xref linkend="ddl-system-columns"/>）。如果该表已经有 OID，则
-      这种形式不会做任何事情。除非该表的外部数据包装器支持 OID，这个列
-      将被简单地读作零。
-     </para>
-
-     <para>
-      注意这和<literal>ADD COLUMN oid oid</literal>并不等效，后者将增加
-      一个刚好名字为<literal>oid</literal>的普通列而不是一个系统列。
-     </para>
-    </listitem>
-   </varlistentry>
 
    <varlistentry>
     <term><literal>SET WITHOUT OIDS</literal></term>
     <listitem>
      <para>
-      这种形式从表移除<literal>oid</literal>系统列。这正好
-      等效于<literal>DROP COLUMN oid RESTRICT</literal>，
-      不过如果表上已经没有<literal>oid</literal>时它不会做出
-      提示或者报错。
+      向后兼容性语法，表示移除<literal>oid</literal>系统列。
+      由于不能再为外部表添加<literal>oid</literal>系统列，此语句不再产生效用。
      </para>
     </listitem>
    </varlistentry>
@@ -598,7 +556,7 @@ ____________________________________________________________________________-->
      </para>
     </listitem>
    </varlistentry>
-   
+
    <varlistentry>
     <term><literal>RENAME</literal></term>
     <listitem>
@@ -635,7 +593,7 @@ ____________________________________________________________________________-->
    动作都能被整合到一个多修改列表以便能被并行应用。例如，可以在一个
    命令中增加几个列并且/或者修改几个列的类型。
   </para>
-  
+
 <!--==========================orignal english content==========================
   <para>
    If the command is written as <literal>ALTER FOREIGN TABLE IF EXISTS ...</literal>
@@ -774,7 +732,7 @@ ____________________________________________________________________________-->
        </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><replaceable class="parameter">table_constraint</replaceable></term>
@@ -905,7 +863,7 @@ ____________________________________________________________________________-->
        </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><replaceable class="parameter">parent_table</replaceable></term>
@@ -1075,7 +1033,7 @@ ____________________________________________________________________________-->
    允许没有列的外部表。
   </para>
  </refsect1>
- 
+
  <refsect1>
 <!--==========================orignal english content==========================
   <title>See Also</title>