diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-10-18 16:16:18 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-10-18 16:16:18 +0000 |
| commit | 73677dd92f35b4c24b6c00b049aa9b0a66fdb702 (patch) | |
| tree | 83001516af1867e74807bfb40392d8adbf869f46 /src/test | |
| parent | 60dcf13ea10a5ab6fa61e8509df36b5823a15857 (diff) | |
| download | postgresql-73677dd92f35b4c24b6c00b049aa9b0a66fdb702.tar.gz | |
The following patch was sent to the patches list:
This patch forces the use of 'DROP VIEW' to destroy views.
It also changes the syntax of DROP VIEW to
DROP VIEW v1, v2, ...
to match the syntax of DROP TABLE.
Some error messages were changed so this patch also includes changes to the
appropriate expected/*.out files.
Doc changes for 'DROP TABLE" and 'DROP VIEW' are included.
--
Mark Hollomon
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/errors.out | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/foreign_key.out | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/inet.out | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 43d29cd8f9..a721b0ac6d 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.26 2000/10/07 20:23:03 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.27 2000/10/18 16:16:14 momjian Exp $ # #------------------------------------------------------------------------- @@ -130,9 +130,11 @@ endif runcheck: all ifneq ($(PORTNAME), win) MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ + MAKE=$(MAKE);export MAKE; \ $(SHELL) ./run_check.sh $(host_tuple) else MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ + MAKE=$(MAKE);export MAKE; \ ./run_check.sh $(host_tuple) endif @echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out" @@ -148,9 +150,11 @@ endif bigcheck: all ifneq ($(PORTNAME), win) MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ + MAKE=$(MAKE);export MAKE; \ $(SHELL) ./run_check.sh $(host_tuple) $(EXTRA_TESTS) else MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ + MAKE=$(MAKE);export MAKE; \ ./run_check.sh $(host_tuple) $(EXTRA_TESTS) endif @echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out" diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out index ca030be4a2..81b905bbae 100644 --- a/src/test/regress/expected/errors.out +++ b/src/test/regress/expected/errors.out @@ -52,7 +52,7 @@ drop table; ERROR: parser: parse error at or near ";" -- no such relation drop table nonesuch; -ERROR: Relation 'nonesuch' does not exist +ERROR: table "nonesuch" is nonexistent -- -- RENAME @@ -122,7 +122,7 @@ drop index 314159; ERROR: parser: parse error at or near "314159" -- no such index drop index nonesuch; -ERROR: index "nonesuch" nonexistent +ERROR: index "nonesuch" is nonexistent -- -- REMOVE AGGREGATE diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index 105d07adfd..42ac65a3fe 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -699,7 +699,7 @@ CREATE TABLE FKTABLE_FAIL2 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest1) NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found DROP TABLE FKTABLE_FAIL1; -ERROR: Relation 'fktable_fail1' does not exist +ERROR: table "fktable_fail1" is nonexistent DROP TABLE FKTABLE_FAIL2; -ERROR: Relation 'fktable_fail2' does not exist +ERROR: table "fktable_fail2" is nonexistent DROP TABLE PKTABLE; diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out index 6822ae3895..4a91fcc96f 100644 --- a/src/test/regress/expected/inet.out +++ b/src/test/regress/expected/inet.out @@ -3,7 +3,7 @@ -- -- prepare the table... DROP TABLE INET_TBL; -ERROR: Relation 'inet_tbl' does not exist +ERROR: table "inet_tbl" is nonexistent CREATE TABLE INET_TBL (c cidr, i inet); INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.226/24'); INSERT INTO INET_TBL (c, i) VALUES ('192.168.1.2/24', '192.168.1.226'); |
