database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Spell "explicitly" correctly, per Simon.

Browse Source
This commit is contained in:
Tom Lane 2005-12-07 15:20:56 +00:00
parent 823702be9d
commit 13ea825b6d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/nodes/parsenodes.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 typedef enum ContainsOids
{ {
MUST_HAVE_OIDS, /* WITH OIDS explicitely specified */ MUST_HAVE_OIDS, /* WITH OIDS explicitly specified */
MUST_NOT_HAVE_OIDS, /* WITHOUT OIDS explicitely specified */ MUST_NOT_HAVE_OIDS, /* WITHOUT OIDS explicitly specified */
DEFAULT_OIDS /* neither specified; use the default, which DEFAULT_OIDS /* neither specified; use the default, which
* is the value of the default_with_oids GUC * is the value of the default_with_oids GUC
* var */ * var */

6
src/test/regress/expected/foreign_key.out
View File

@ -970,7 +970,7 @@ drop table pktable_base;
-- Deferrable constraints -- Deferrable constraints
-- (right now, only FOREIGN KEY constraints can be deferred) -- (right now, only FOREIGN KEY constraints can be deferred)
-- --
-- deferrable, explicitely deferred -- deferrable, explicitly deferred
CREATE TABLE pktable ( CREATE TABLE pktable (
id INT4 PRIMARY KEY, id INT4 PRIMARY KEY,
other INT4 other INT4
@ -985,7 +985,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "fktable_pkey" fo
INSERT INTO fktable VALUES (5, 10); INSERT INTO fktable VALUES (5, 10);
ERROR: insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey" ERROR: insert or update on table "fktable" violates foreign key constraint "fktable_fk_fkey"
DETAIL: Key (fk)=(10) is not present in table "pktable". DETAIL: Key (fk)=(10) is not present in table "pktable".
-- explicitely defer the constraint -- explicitly defer the constraint
BEGIN; BEGIN;
SET CONSTRAINTS ALL DEFERRED; SET CONSTRAINTS ALL DEFERRED;
INSERT INTO fktable VALUES (10, 15); INSERT INTO fktable VALUES (10, 15);
@ -1008,7 +1008,7 @@ BEGIN;
INSERT INTO fktable VALUES (100, 200); INSERT INTO fktable VALUES (100, 200);
INSERT INTO pktable VALUES (200, 500); -- make the FK insert valid INSERT INTO pktable VALUES (200, 500); -- make the FK insert valid
COMMIT; COMMIT;
-- default to deferred, explicitely make immediate -- default to deferred, explicitly make immediate
BEGIN; BEGIN;
SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL IMMEDIATE;
-- should fail -- should fail

6
src/test/regress/sql/foreign_key.sql
View File

@ -599,7 +599,7 @@ drop table pktable_base;
-- (right now, only FOREIGN KEY constraints can be deferred) -- (right now, only FOREIGN KEY constraints can be deferred)
-- --
-- deferrable, explicitely deferred -- deferrable, explicitly deferred
CREATE TABLE pktable ( CREATE TABLE pktable (
id INT4 PRIMARY KEY, id INT4 PRIMARY KEY,
other INT4 other INT4
@ -613,7 +613,7 @@ CREATE TABLE fktable (
-- default to immediate: should fail -- default to immediate: should fail
INSERT INTO fktable VALUES (5, 10); INSERT INTO fktable VALUES (5, 10);
-- explicitely defer the constraint -- explicitly defer the constraint
BEGIN; BEGIN;
SET CONSTRAINTS ALL DEFERRED; SET CONSTRAINTS ALL DEFERRED;
@ -644,7 +644,7 @@ INSERT INTO pktable VALUES (200, 500); -- make the FK insert valid
COMMIT; COMMIT;
-- default to deferred, explicitely make immediate -- default to deferred, explicitly make immediate
BEGIN; BEGIN;
SET CONSTRAINTS ALL IMMEDIATE; SET CONSTRAINTS ALL IMMEDIATE;