aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/sgml')
-rw-r--r--doc/src/sgml/config.sgml30
-rw-r--r--doc/src/sgml/ddl.sgml8
-rw-r--r--doc/src/sgml/queries.sgml8
3 files changed, 6 insertions, 40 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index b6b20a368ec..8d7b3bfd663 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -7394,36 +7394,6 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
</listitem>
</varlistentry>
- <varlistentry id="guc-sql-inheritance" xreflabel="sql_inheritance">
- <term><varname>sql_inheritance</varname> (<type>boolean</type>)
- <indexterm>
- <primary><varname>sql_inheritance</> configuration parameter</primary>
- </indexterm>
- <indexterm><primary>inheritance</></>
- </term>
- <listitem>
- <para>
- This setting controls whether undecorated table references are
- considered to include inheritance child tables. The default is
- <literal>on</>, which means child tables are included (thus,
- a <literal>*</> suffix is assumed by default). If turned
- <literal>off</>, child tables are not included (thus, an
- <literal>ONLY</literal> prefix is assumed). The SQL standard
- requires child tables to be included, so the <literal>off</> setting
- is not spec-compliant, but it is provided for compatibility with
- <productname>PostgreSQL</> releases prior to 7.1.
- See <xref linkend="ddl-inherit"> for more information.
- </para>
-
- <para>
- Turning <varname>sql_inheritance</> off is deprecated, because that
- behavior has been found to be error-prone as well as contrary to SQL
- standard. Discussions of inheritance behavior elsewhere in this
- manual generally assume that it is <literal>on</>.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry id="guc-standard-conforming-strings" xreflabel="standard_conforming_strings">
<term><varname>standard_conforming_strings</varname> (<type>boolean</type>)
<indexterm><primary>strings</><secondary>standard conforming</></>
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 7e1bc0e5341..d7117cbc8f8 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -2529,11 +2529,9 @@ SELECT name, altitude
WHERE altitude &gt; 500;
</programlisting>
- Writing <literal>*</> is not necessary, since this behavior is
- the default (unless you have changed the setting of the
- <xref linkend="guc-sql-inheritance"> configuration option).
- However writing <literal>*</> might be useful to emphasize that
- additional tables will be searched.
+ Writing <literal>*</> is not necessary, since this behavior is always
+ the default. However, this syntax is still supported for
+ compatibility with older releases where the default could be changed.
</para>
<para>
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index 5cc6dbce11b..0f84c12bec6 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -145,11 +145,9 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
<para>
Instead of writing <literal>ONLY</> before the table name, you can write
<literal>*</> after the table name to explicitly specify that descendant
- tables are included. Writing <literal>*</> is not necessary since that
- behavior is the default (unless you have changed the setting of the <xref
- linkend="guc-sql-inheritance"> configuration option). However writing
- <literal>*</> might be useful to emphasize that additional tables will be
- searched.
+ tables are included. There is no real reason to use this syntax any more,
+ because searching descendent tables is now always the default behavior.
+ However, it is supported for compatibility with older releases.
</para>
<sect3 id="queries-join">