aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/datatype.sgml47
-rw-r--r--doc/src/sgml/ref/alter_table.sgml8
-rw-r--r--doc/src/sgml/ref/create_table.sgml59
-rw-r--r--doc/src/sgml/ref/create_table_as.sgml40
-rw-r--r--doc/src/sgml/ref/pg_dump.sgml9
-rw-r--r--doc/src/sgml/ref/prepare.sgml15
-rw-r--r--doc/src/sgml/ref/select_into.sgml34
-rw-r--r--doc/src/sgml/runtime.sgml35
-rw-r--r--doc/src/sgml/spi.sgml6
-rw-r--r--src/backend/executor/execMain.c12
-rw-r--r--src/backend/parser/gram.y10
-rw-r--r--src/backend/utils/misc/guc.c14
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample3
-rw-r--r--src/bin/pg_dump/pg_dump.c5
-rw-r--r--src/bin/psql/tab-complete.c3
-rw-r--r--src/include/utils/guc.h4
-rw-r--r--src/test/regress/expected/without_oid.out2
-rw-r--r--src/test/regress/sql/without_oid.sql2
18 files changed, 218 insertions, 90 deletions
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index a214f5398c8..8bae619c3d0 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.134 2003/12/01 20:34:53 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.135 2003/12/01 22:07:55 momjian Exp $
-->
<chapter id="datatype">
@@ -2932,24 +2932,43 @@ SELECT * FROM test;
<para>
Object identifiers (OIDs) are used internally by
- <productname>PostgreSQL</productname> as primary keys for various system
- tables. Also, an OID system column is added to user-created tables
- (unless <literal>WITHOUT OIDS</> is specified at table creation time).
- Type <type>oid</> represents an object identifier. There are also
- several alias types for <type>oid</>: <type>regproc</>, <type>regprocedure</>,
- <type>regoper</>, <type>regoperator</>, <type>regclass</>,
- and <type>regtype</>. <xref linkend="datatype-oid-table"> shows an overview.
+ <productname>PostgreSQL</productname> as primary keys for various
+ system tables. An OID system column is also added to user-created
+ tables, unless <literal>WITHOUT OIDS</literal> is specified when
+ the table is created, or the <varname>default_with_oids</varname>
+ configuration variable is set to false. Type <type>oid</>
+ represents an object identifier. There are also several alias
+ types for <type>oid</>: <type>regproc</>, <type>regprocedure</>,
+ <type>regoper</>, <type>regoperator</>, <type>regclass</>, and
+ <type>regtype</>. <xref linkend="datatype-oid-table"> shows an
+ overview.
</para>
<para>
- The <type>oid</> type is currently implemented as an unsigned four-byte
- integer.
- Therefore, it is not large enough to provide database-wide uniqueness
- in large databases, or even in large individual tables. So, using a
- user-created table's OID column as a primary key is discouraged.
- OIDs are best used only for references to system tables.
+ The <type>oid</> type is currently implemented as an unsigned
+ four-byte integer. Therefore, it is not large enough to provide
+ database-wide uniqueness in large databases, or even in large
+ individual tables. So, using a user-created table's OID column as
+ a primary key is discouraged. OIDs are best used only for
+ references to system tables.
</para>
+ <note>
+ <para>
+ OIDs are included by default in user-created tables in
+ <productname>PostgreSQL</productname> &version;. However, this
+ behavior is likely to change in a future version of
+ <productname>PostgreSQL</productname>. Eventually, user-created
+ tables will not include an OID system column unless <literal>WITH
+ OIDS</literal> is specified when the table is created, or the
+ <varname>default_with_oids</varname> configuration variable is set
+ to true. If your application requires the presence of an OID
+ system column in a table, it should specify <literal>WITH
+ OIDS</literal> when that table is created to ensure compatibility
+ with future releases of <productname>PostgreSQL</productname>.
+ </para>
+ </note>
+
<para>
The <type>oid</> type itself has few operations beyond comparison.
It can be cast to
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 9662d9b02f4..d10be7f2905 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.63 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.64 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -149,6 +149,12 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
of the OID are kept indefinitely. This is semantically similar
to the <literal>DROP COLUMN</literal> process.
</para>
+
+ <para>
+ Note that there is no variant of <command>ALTER TABLE</command>
+ that allows OIDs to be restored to a table once they have been
+ removed.
+ </para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 00814fa4431..4af03bccfaa 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.76 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.77 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -111,12 +111,12 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
<para>
If specified, the table is created as a temporary table.
Temporary tables are automatically dropped at the end of a
- session, or optionally at the end of the current transaction
- (see ON COMMIT below). Existing permanent tables with the same
- name are not visible to the current session while the temporary
- table exists, unless they are referenced with schema-qualified
- names. Any indexes created on a temporary table are automatically
- temporary as well.
+ session, or optionally at the end of the current transaction
+ (see <literal>ON COMMIT</literal> below). Existing permanent
+ tables with the same name are not visible to the current session
+ while the temporary table exists, unless they are referenced
+ with schema-qualified names. Any indexes created on a temporary
+ table are automatically temporary as well.
</para>
<para>
@@ -243,22 +243,30 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
<listitem>
<para>
This optional clause specifies whether rows of the new table
- should have OIDs (object identifiers) assigned to them. The
- default is to have OIDs. (If the new table inherits from any
- tables that have OIDs, then <literal>WITH OIDS</> is forced even
- if the command says <literal>WITHOUT OIDS</>.)
+ should have OIDs (object identifiers) assigned to them. If
+ neither <literal>WITH OIDS</literal> nor <literal>WITHOUT
+ OIDS</literal> is specified, the default value depends upon the
+ <varname>default_with_oids</varname> configuration parameter. (If
+ the new table inherits from any tables that have OIDs, then
+ <literal>WITH OIDS</> is forced even if the command says
+ <literal>WITHOUT OIDS</>.)
</para>
<para>
- Specifying <literal>WITHOUT OIDS</> allows the user to suppress
- generation of OIDs for rows of a table. This may be worthwhile
- for large tables, since it will reduce OID consumption and
- thereby postpone wraparound of the 32-bit OID counter. Once the
- counter wraps around, uniqueness of OIDs can no longer be
- assumed, which considerably reduces their usefulness. Specifying
- <literal>WITHOUT OIDS</literal> also reduces the space required
- to store the table on disk by 4 bytes per row of the table,
- thereby improving performance.
+ If <literal>WITHOUT OIDS</literal> is specified or implied, this
+ means that the generation of OIDs for this table will be
+ supressed. This is generally considered worthwhile, since it
+ will reduce OID consumption and thereby postpone the wraparound
+ of the 32-bit OID counter. Once the counter wraps around, OIDs
+ can no longer be assumed to be unique, which makes them
+ considerably less useful. In addition, excluding OIDs from a
+ table reduces the space required on disk to storage the table by
+ 4 bytes per row, leading to increased performance.
+ </para>
+
+ <para>
+ To remove OIDs from a table after it has been created, use <xref
+ linkend="sql-altertable" endterm="sql-altertable-title">.
</para>
</listitem>
</varlistentry>
@@ -572,18 +580,17 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
<itemizedlist>
<listitem>
<para>
- Whenever an application makes use of OIDs to identify specific
+ Using OIDs in new applications is not recommended: where
+ possible, using a <literal>SERIAL</literal> or other sequence
+ generator as the table's primary key is preferred. However, if
+ your application does make use of OIDs to identify specific rows
rows of a table, it is recommended to create a unique constraint
on the <structfield>oid</> column of that table, to ensure that
OIDs in the table will indeed uniquely identify rows even after
counter wraparound. Avoid assuming that OIDs are unique across
tables; if you need a database-wide unique identifier, use the
combination of <structfield>tableoid</> and row OID for the
- purpose. (It is likely that future <productname>PostgreSQL</>
- releases will use a separate OID counter for each table, so that
- it will be <emphasis>necessary</>, not optional, to include
- <structfield>tableoid</> to have a unique identifier
- database-wide.)
+ purpose.
</para>
<tip>
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 856846c50b2..a7382abfdc9 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.17 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.18 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -51,7 +51,20 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
<refsect1>
<title>Parameters</title>
-
+
+ <variablelist>
+ <varlistentry>
+ <term><literal>GLOBAL</literal> or <literal>LOCAL</literal></term>
+ <listitem>
+ <para>
+ Ignored for compatibility. Refer to <xref
+ linkend="sql-createtable" endterm="sql-createtable-title"> for
+ details.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
<variablelist>
<varlistentry>
<term><literal>TEMPORARY</> or <literal>TEMP</></term>
@@ -105,10 +118,24 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
<title>Notes</title>
<para>
- This command is functionally equivalent to <xref
- linkend="sql-selectinto" endterm="sql-selectinto-title">, but it is preferred since it is less
- likely to be confused with other uses of the <command>SELECT
- ... INTO</command> syntax.
+ This command is functionally similar to <xref
+ linkend="sql-selectinto" endterm="sql-selectinto-title">, but it is
+ preferred since it is less likely to be confused with other uses of
+ the <command>SELECT INTO</command> syntax.
+ </para>
+
+ <para>
+ Prior to PostgreSQL 7.5, <command>CREATE TABLE AS</command> always
+ included OIDs in the table it produced. Furthermore, these OIDs
+ were newly generated: they were distinct from the OIDs of any of
+ the rows in the source tables of the <command>SELECT</command> or
+ <command>EXECUTE</command> statement. Therefore, if <command>CREATE
+ TABLE AS</command> was frequently executed, the OID counter would
+ be rapidly incremented. As of PostgreSQL 7.5, the inclusion of OIDs
+ in the table generated by <command>CREATE TABLE AS</command> is
+ controlled by the <varname>default_with_oids</varname> configuration
+ variable. This variable currently defaults to true, but will likely
+ default to false in a future release of <productname>PostgreSQL</>.
</para>
</refsect1>
@@ -129,7 +156,6 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
<simplelist type="inline">
<member><xref linkend="sql-createtable" endterm="sql-createtable-title"></member>
- <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
<member><xref linkend="sql-execute" endterm="sql-execute-title"></member>
<member><xref linkend="sql-select" endterm="sql-select-title"></member>
<member><xref linkend="sql-selectinto" endterm="sql-selectinto-title"></member>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index f02c3638a7f..c6041237240 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.67 2003/11/29 19:51:39 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.68 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -611,8 +611,11 @@ CREATE DATABASE foo WITH TEMPLATE template0;
</para>
<para>
- Once restored, it is wise to run <command>ANALYZE</> on each
- restored table so the optimizer has useful statistics.
+ The dump file produced by <application>pg_dump</application> does
+ not contain the statistics used by the optimizer to make query
+ planning decisions. Therefore, it is wise to run
+ <command>ANALYZE</command> after restoring from a dump file to
+ ensure good performance.
</para>
</refsect1>
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index 82e36fe89fc..684b4bb8ba0 100644
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.8 2003/11/29 19:51:39 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.9 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -52,13 +52,12 @@ PREPARE <replaceable class="PARAMETER">plan_name</replaceable> [ (<replaceable c
</para>
<para>
- Prepared statements are only stored in and for the duration of
- the current database session. When
- the session ends, the prepared statement is forgotten, and so it must be
- recreated before being used again. This also means that a single
- prepared statement cannot be used by multiple simultaneous database
- clients; however, each client can create their own prepared statement
- to use.
+ Prepared statements are only for the duration of the current
+ database session. When the session ends, the prepared statement is
+ forgotten, so it must be recreated before being used again. This
+ also means that a single prepared statement cannot be used by
+ multiple simultaneous database clients; however, each client can
+ create their own prepared statement to use.
</para>
<para>
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index cb321f0cfa6..1261f3cd4b5 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select_into.sgml,v 1.25 2003/11/29 19:51:39 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select_into.sgml,v 1.26 2003/12/01 22:07:58 momjian Exp $
PostgreSQL documentation
-->
@@ -82,13 +82,29 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="PARAMETER">expression</replac
<title>Notes</title>
<para>
- <xref linkend="sql-createtableas" endterm="sql-createtableas-title">
- is functionally equivalent to <command>SELECT INTO</command>.
- <command>CREATE TABLE AS</command> is the recommended syntax, since
- this form of <command>SELECT INTO</command> is not available in
- <application>ECPG</application> or
- <application>PL/pgSQL</application>, because they interpret the
- <literal>INTO</literal> clause differently.
+ <xref linkend="sql-createtableas"
+ endterm="sql-createtableas-title"> is functionally similar to
+ <command>SELECT INTO</command>. <command>CREATE TABLE AS</command>
+ is the recommended syntax, since this form of <command>SELECT
+ INTO</command> is not available in <application>ECPG</application>
+ or <application>PL/pgSQL</application>, because they interpret the
+ <literal>INTO</literal> clause differently. Furthermore,
+ <command>CREATE TABLE AS</command> offers a superset of the
+ functionality provided by <command>SELECT INTO</command>.
+ </para>
+
+ <para>
+ Prior to PostgreSQL 7.5, the table created by <command>SELECT
+ INTO</command> always included OIDs. Furthermore, these OIDs were
+ newly generated: they were distinct from the OIDs of any of the
+ rows in the source tables of the <command>SELECT INTO</command>
+ statement. Therefore, if <command>SELECT INTO</command> was
+ frequently executed, the OID counter would be rapidly
+ incremented. As of PostgreSQL 7.5, the inclusion of OIDs in the
+ table created by <command>SELECT INTO</command> is controlled by
+ the <varname>default_with_oids</varname> configuration
+ variable. This variable currently defaults to true, but will likely
+ default to false in a future release of <productname>PostgreSQL</>.
</para>
</refsect1>
@@ -96,7 +112,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="PARAMETER">expression</replac
<title>Compatibility</title>
<para>
- The SQL standard uses <command>SELECT ... INTO</command> to
+ The SQL standard uses <command>SELECT INTO</command> to
represent selecting values into scalar variables of a host program,
rather than creating a new table. This indeed is the usage found
in <application>ECPG</application> (see <xref linkend="ecpg">) and
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 2ee3ca9667b..49bf3aa7af4 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.223 2003/11/29 19:51:37 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.224 2003/12/01 22:07:56 momjian Exp $
-->
<Chapter Id="runtime">
@@ -2433,7 +2433,38 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
</listitem>
</varlistentry>
- </variablelist>
+ <varlistentry>
+ <term><varname>default_with_oids</varname> (<type>boolean</type>)</term>
+ <listitem>
+ <para>
+ This controls whether <command>CREATE TABLE</command> will
+ include OIDs in newly-created tables, if neither <literal>WITH
+ OIDS</literal> or <literal>WITHOUT OIDS</literal> have been
+ specified. It also determines whether OIDs will be included in
+ the table generated by <command>SELECT INTO</command> and
+ <command>CREATE TABLE AS</command>. In
+ <productname>PostgreSQL</productname> &version;
+ <varname>default_with_oids</varname> defaults to true. This is
+ also the behavior of previous versions of
+ <productname>PostgreSQL</productname>. However, assuming that
+ tables will contain OIDs by default is not
+ encouraged. Therefore, this option will default to false in a
+ future release of <productname>PostgreSQL</productname>.
+ </para>
+
+ <para>
+ To ease compatibility with applications that make use of OIDs,
+ this option should left enabled. To ease compatibility with
+ future versions of <productname>PostgreSQL</productname>, this
+ option should be disabled, and applications that require OIDs
+ on certain tables should explictely specify <literal>WITH
+ OIDS</literal> when issuing the <command>CREATE
+ TABLE</command> statements for the tables in question.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
</sect3>
<sect3 id="runtime-config-compatible-clients">
<title>Platform and Client Compatibility</title>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 36b6d8be2f3..aab5b0dae16 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.29 2003/11/29 19:51:37 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.30 2003/12/01 22:07:57 momjian Exp $
-->
<chapter id="spi">
@@ -320,7 +320,7 @@ typedef struct
<listitem>
<para>
if a <command>SELECT</command> (but not <command>SELECT
- ... INTO</>) was executed
+ INTO</>) was executed
</para>
</listitem>
</varlistentry>
@@ -329,7 +329,7 @@ typedef struct
<term><symbol>SPI_OK_SELINTO</symbol></term>
<listitem>
<para>
- if a <command>SELECT ... INTO</command> was executed
+ if a <command>SELECT INTO</command> was executed
</para>
</listitem>
</varlistentry>
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 2be2d2d6395..e53bb1f7040 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.222 2003/11/29 19:51:48 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.223 2003/12/01 22:07:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,6 +43,7 @@
#include "optimizer/var.h"
#include "parser/parsetree.h"
#include "utils/acl.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -593,11 +594,12 @@ InitPlan(QueryDesc *queryDesc, bool explainOnly)
do_select_into = true;
/*
- * For now, always create OIDs in SELECT INTO; this is for
- * backwards compatibility with pre-7.3 behavior. Eventually we
- * might want to allow the user to choose.
+ * The presence of OIDs in the result set of SELECT INTO is
+ * controlled by the default_with_oids GUC parameter. The
+ * behavior in versions of PostgreSQL prior to 7.5 is to
+ * always include OIDs.
*/
- estate->es_force_oids = true;
+ estate->es_force_oids = default_with_oids;
}
/*
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 9e584281c5e..8866200444f 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.440 2003/11/29 19:51:51 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.441 2003/12/01 22:07:58 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -63,6 +63,7 @@
#include "utils/numeric.h"
#include "utils/datetime.h"
#include "utils/date.h"
+#include "utils/guc.h"
extern List *parsetree; /* final parse result is delivered here */
@@ -1822,7 +1823,12 @@ OptInherit: INHERITS '(' qualified_name_list ')' { $$ = $3; }
OptWithOids:
WITH OIDS { $$ = TRUE; }
| WITHOUT OIDS { $$ = FALSE; }
- | /*EMPTY*/ { $$ = TRUE; }
+ /*
+ * If the user didn't explicitely specify WITH or WITHOUT
+ * OIDS, decide whether to include OIDs based on the
+ * "default_with_oids" GUC var
+ */
+ | /*EMPTY*/ { $$ = default_with_oids; }
;
OnCommitOption: ON COMMIT DROP { $$ = ONCOMMIT_DROP; }
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 030dd9033c8..18cd7e147e7 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.173 2003/12/01 03:55:21 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.174 2003/12/01 22:08:00 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -126,6 +126,8 @@ bool Australian_timezones = false;
bool Password_encryption = true;
+bool default_with_oids = true;
+
int log_min_error_statement = PANIC;
int log_min_messages = NOTICE;
int client_min_messages = NOTICE;
@@ -263,7 +265,7 @@ const char *const config_group_names[] =
/* QUERY_TUNING */
gettext_noop("Query Tuning"),
/* QUERY_TUNING_METHOD */
- gettext_noop("Query Tuning / Planner Method Enabling"),
+ gettext_noop("Query Tuning / Planner Method Configuration"),
/* QUERY_TUNING_COST */
gettext_noop("Query Tuning / Planner Cost Constants"),
/* QUERY_TUNING_GEQO */
@@ -831,6 +833,14 @@ static struct config_bool ConfigureNamesBool[] =
&check_function_bodies,
true, NULL, NULL
},
+ {
+ {"default_with_oids", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
+ gettext_noop("By default, newly-created tables should have OIDs"),
+ NULL
+ },
+ &default_with_oids,
+ true, NULL, NULL
+ },
/* End-of-list marker */
{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index e4305d98596..98d4d76d3ae 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -100,7 +100,7 @@
# QUERY TUNING
#---------------------------------------------------------------------------
-# - Planner Method Enabling -
+# - Planner Method Configuration -
#enable_hashagg = true
#enable_hashjoin = true
@@ -255,6 +255,7 @@
#add_missing_from = true
#regex_flavor = advanced # advanced, extended, or basic
#sql_inheritance = true
+#default_with_oids = true
# - Other Platforms & Clients -
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 15b4ebd9705..029f30f6642 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
* by PostgreSQL
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.358 2003/11/29 19:52:05 pgsql Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.359 2003/12/01 22:08:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -5627,8 +5627,7 @@ dumpOneTable(Archive *fout, TableInfo *tbinfo, TableInfo *g_tblinfo)
appendPQExpBuffer(q, ")");
}
- if (!tbinfo->hasoids)
- appendPQExpBuffer(q, " WITHOUT OIDS");
+ appendPQExpBuffer(q, tbinfo->hasoids ? " WITH OIDS" : " WITHOUT OIDS");
appendPQExpBuffer(q, ";\n");
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index f7e346478aa..c50ce514d1f 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.94 2003/11/29 19:52:07 pgsql Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.95 2003/12/01 22:08:01 momjian Exp $
*/
/*----------------------------------------------------------------------
@@ -499,6 +499,7 @@ psql_completion(char *text, int start, int end)
"default_statistics_target",
"default_transaction_isolation",
"default_transaction_read_only",
+ "default_with_oids",
"dynamic_library_path",
"effective_cache_size",
"enable_hashagg",
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index b92cd68dc9d..29d731146d3 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.42 2003/11/29 22:41:15 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.43 2003/12/01 22:08:02 momjian Exp $
*--------------------------------------------------------------------
*/
#ifndef GUC_H
@@ -109,6 +109,8 @@ extern bool log_btree_build_stats;
extern bool SQL_inheritance;
extern bool Australian_timezones;
+extern bool default_with_oids;
+
extern int log_min_error_statement;
extern int log_min_messages;
extern int client_min_messages;
diff --git a/src/test/regress/expected/without_oid.out b/src/test/regress/expected/without_oid.out
index c25d4e3640b..23a89a06c52 100644
--- a/src/test/regress/expected/without_oid.out
+++ b/src/test/regress/expected/without_oid.out
@@ -1,7 +1,7 @@
--
-- WITHOUT OID
--
-CREATE TABLE wi (i INT);
+CREATE TABLE wi (i INT) WITH OIDS;
CREATE TABLE wo (i INT) WITHOUT OIDS;
INSERT INTO wi VALUES (1); -- 1
INSERT INTO wo SELECT i FROM wi; -- 1
diff --git a/src/test/regress/sql/without_oid.sql b/src/test/regress/sql/without_oid.sql
index dcef735e81e..727e743d02b 100644
--- a/src/test/regress/sql/without_oid.sql
+++ b/src/test/regress/sql/without_oid.sql
@@ -2,7 +2,7 @@
-- WITHOUT OID
--
-CREATE TABLE wi (i INT);
+CREATE TABLE wi (i INT) WITH OIDS;
CREATE TABLE wo (i INT) WITHOUT OIDS;
INSERT INTO wi VALUES (1); -- 1
INSERT INTO wo SELECT i FROM wi; -- 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 20:41:54 +0000