diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/nodes/parsenodes.h | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/foreign_key.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/foreign_key.sql | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 1ae6824954c..ba396527957 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.297 2005/11/28 04:35:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.298 2005/12/07 15:20:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -660,8 +660,8 @@ typedef enum SetOperation typedef enum ContainsOids { - MUST_HAVE_OIDS, /* WITH OIDS explicitely specified */ - MUST_NOT_HAVE_OIDS, /* WITHOUT OIDS explicitely specified */ + MUST_HAVE_OIDS, /* WITH OIDS explicitly specified */ + MUST_NOT_HAVE_OIDS, /* WITHOUT OIDS explicitly specified */ DEFAULT_OIDS /* neither specified; use the default, which * is the value of the default_with_oids GUC * var */ diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index e3ea729e6fa..bb48bfd3afa 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -970,7 +970,7 @@ drop table pktable_base; -- Deferrable constraints -- (right now, only FOREIGN KEY constraints can be deferred) -- --- deferrable, explicitely deferred +-- deferrable, explicitly deferred CREATE TABLE pktable ( id INT4 PRIMARY KEY, other INT4 @@ -985,7 +985,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "fktable_pkey" fo INSERT INTO fktable VALUES (5, 10); ERROR: insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey" DETAIL: Key (fk)=(10) is not present in table "pktable". --- explicitely defer the constraint +-- explicitly defer the constraint BEGIN; SET CONSTRAINTS ALL DEFERRED; INSERT INTO fktable VALUES (10, 15); @@ -1008,7 +1008,7 @@ BEGIN; INSERT INTO fktable VALUES (100, 200); INSERT INTO pktable VALUES (200, 500); -- make the FK insert valid COMMIT; --- default to deferred, explicitely make immediate +-- default to deferred, explicitly make immediate BEGIN; SET CONSTRAINTS ALL IMMEDIATE; -- should fail diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql index 5ab15c1b39b..2b22d0cecd1 100644 --- a/src/test/regress/sql/foreign_key.sql +++ b/src/test/regress/sql/foreign_key.sql @@ -599,7 +599,7 @@ drop table pktable_base; -- (right now, only FOREIGN KEY constraints can be deferred) -- --- deferrable, explicitely deferred +-- deferrable, explicitly deferred CREATE TABLE pktable ( id INT4 PRIMARY KEY, other INT4 @@ -613,7 +613,7 @@ CREATE TABLE fktable ( -- default to immediate: should fail INSERT INTO fktable VALUES (5, 10); --- explicitely defer the constraint +-- explicitly defer the constraint BEGIN; SET CONSTRAINTS ALL DEFERRED; @@ -644,7 +644,7 @@ INSERT INTO pktable VALUES (200, 500); -- make the FK insert valid COMMIT; --- default to deferred, explicitely make immediate +-- default to deferred, explicitly make immediate BEGIN; SET CONSTRAINTS ALL IMMEDIATE; |