diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index b0174bcd1e..4966eb757b 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,5 +1,5 @@
@@ -141,7 +141,7 @@ ALTER TABLE table
- ALTER
+ ALTER TABLE
Message returned from column or table renaming.
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 8cf5168a5b..cdfbb792c7 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -78,7 +78,7 @@ ALTER TRIGGER trigger ON
- ALTER
+ ALTER TRIGGER
Message returned from trigger renaming.
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 6e1204a7ad..e82bb4d90e 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,5 +1,5 @@
@@ -58,7 +58,7 @@ CLOSE cursor
-CLOSE
+CLOSE CURSOR
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index 0c326b6f8d..21c547f6b6 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -1,5 +1,5 @@
@@ -134,7 +134,7 @@ CREATE AGGREGATE name ( BASETYPE =
-CREATE
+CREATE AGGREGATE
diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml
index c5af73ad42..0e86c93f01 100644
--- a/doc/src/sgml/ref/create_constraint.sgml
+++ b/doc/src/sgml/ref/create_constraint.sgml
@@ -1,5 +1,5 @@
@@ -101,7 +101,7 @@ CREATE CONSTRAINT TRIGGER name
-CREATE CONSTRAINT
+CREATE TRIGGER
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 637d4965a4..a3af001006 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,5 +1,5 @@
@@ -174,7 +174,7 @@ CREATE [ UNIQUE ] INDEX index_name
-CREATE
+CREATE INDEX
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 4fc6399f3d..e5f47be9ff 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,5 +1,5 @@
@@ -125,7 +125,7 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE langna
-CREATE
+CREATE LANGUAGE
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index b1371140f1..82ea44921d 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,5 +1,5 @@
@@ -176,7 +176,7 @@ CREATE OPERATOR name ( PROCEDURE =
-CREATE
+CREATE OPERATOR
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index ae9571a7c5..86046359b4 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
@@ -121,7 +121,7 @@ NOTHING
-CREATE
+CREATE RULE
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 64f96b34d9..daecc3b0d4 100644
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -1,5 +1,5 @@
@@ -75,7 +75,7 @@ CREATE SCHEMA AUTHORIZATION username
-CREATE
+CREATE SCHEMA
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 5df6618bfa..3db79850c8 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,5 +1,5 @@
@@ -161,7 +161,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE seqname
-CREATE
+CREATE SEQUENCE
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 936fe1ba3c..5ef7a5d6e7 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
@@ -503,7 +503,7 @@ and table_constraint is:
- CREATE
+ CREATE TABLE
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 243fe85271..e9f66d95b4 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -1,5 +1,5 @@
@@ -98,7 +98,7 @@ CREATE TRIGGER name { BEFORE | AFTE
-CREATE
+CREATE TRIGGER
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 82847df7d7..042a8fd51d 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,5 +1,5 @@
@@ -186,7 +186,7 @@ CREATE TYPE typename ( INPUT =
-CREATE
+CREATE TYPE
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index f7fa744366..aa7c869285 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,5 +1,5 @@
@@ -81,7 +81,7 @@ class="PARAMETER">column name list ) ] AS SELECT
-CREATE
+CREATE VIEW
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index fee93fcbab..77c45d90b0 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
@@ -140,7 +140,7 @@ DECLARE cursorname [ BINARY ] [ INS
-SELECT
+DECLARE CURSOR
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index b39daaaeb9..857a7f10f4 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -1,5 +1,5 @@
@@ -69,7 +69,7 @@ DROP AGGREGATE name (
-DROP
+DROP AGGREGATE
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index 0a74649f95..5bc73a065f 100644
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -1,5 +1,5 @@
@@ -77,7 +77,7 @@ DROP DOMAIN domainname [, ...] [ C
-DROP
+DROP DOMAIN
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 14c6f451c9..268d8c66e8 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -1,5 +1,5 @@
@@ -65,7 +65,7 @@ DROP FUNCTION name ( [
-DROP
+DROP FUNCTION
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index 99336704cf..0db2c60946 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -1,5 +1,5 @@
@@ -56,7 +56,7 @@ DROP INDEX index_name [, ...]
-DROP
+DROP INDEX
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 26668d5995..08badab808 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -1,5 +1,5 @@
@@ -58,7 +58,7 @@ DROP [ PROCEDURAL ] LANGUAGE name
-DROP
+DROP LANGUAGE
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index 5383d3bea3..bc4657038f 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -1,5 +1,5 @@
@@ -76,7 +76,7 @@ DROP OPERATOR id (
-DROP
+DROP OPERATOR
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index 1596b460c4..4f8ea97f88 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -1,5 +1,5 @@
@@ -65,7 +65,7 @@ DROP RULE name ON
-DROP
+DROP RULE
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index 669d4962a5..4c371164e1 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -1,5 +1,5 @@
@@ -57,7 +57,7 @@ DROP SEQUENCE name [, ...]
-DROP
+DROP SEQUENCE
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index 20de8b484c..cae3275067 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -1,5 +1,5 @@
@@ -56,7 +56,7 @@ DROP TABLE name [, ...]
-DROP
+DROP TABLE
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 30c9260549..e4f157b1d7 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -1,5 +1,5 @@
@@ -66,7 +66,7 @@ DROP TRIGGER name ON
-DROP
+DROP TRIGGER
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index 9d88fc85b9..3ac0f17ae9 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -1,5 +1,5 @@
@@ -56,7 +56,7 @@ DROP TYPE typename [, ...]
-DROP
+DROP TYPE
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 5d168628fd..a789e38c4c 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -1,5 +1,5 @@
@@ -58,7 +58,7 @@ DROP VIEW name [, ...]
-DROP
+DROP VIEW
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 9575386d3b..2f14ead684 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -1,5 +1,5 @@
@@ -48,7 +48,7 @@ ROLLBACK [ WORK | TRANSACTION ]
-ABORT
+ROLLBACK
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index f54f70c197..65ff6eca29 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -1,5 +1,5 @@
@@ -401,7 +401,7 @@ SELECT setseed(value);
- SET VARIABLE
+ SET
Message returned if successful.
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index a3888b7d32..723079ab3b 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -1,5 +1,5 @@
@@ -58,7 +58,7 @@ TRUNCATE [ TABLE ] name
-TRUNCATE
+TRUNCATE TABLE
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 1ea4fa9a6b..f5d00a300e 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.266 2002/05/17 18:32:52 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.267 2002/05/18 15:44:47 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1688,7 +1688,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.266 $ $Date: 2002/05/17 18:32:52 $\n");
+ puts("$Revision: 1.267 $ $Date: 2002/05/18 15:44:47 $\n");
}
/*
@@ -2168,7 +2168,7 @@ CreateCommandTag(Node *parsetree)
break;
case T_ClosePortalStmt:
- tag = "CLOSE";
+ tag = "CLOSE CURSOR";
break;
case T_FetchStmt:
@@ -2183,19 +2183,41 @@ CreateCommandTag(Node *parsetree)
break;
case T_CreateSchemaStmt:
- tag = "CREATE";
+ tag = "CREATE SCHEMA";
break;
case T_CreateStmt:
- tag = "CREATE";
+ tag = "CREATE TABLE";
break;
case T_DropStmt:
- tag = "DROP";
+ switch (((DropStmt *) parsetree)->removeType)
+ {
+ case DROP_TABLE:
+ tag = "DROP TABLE";
+ break;
+ case DROP_SEQUENCE:
+ tag = "DROP SEQUENCE";
+ break;
+ case DROP_VIEW:
+ tag = "DROP VIEW";
+ break;
+ case DROP_INDEX:
+ tag = "DROP INDEX";
+ break;
+ case DROP_TYPE:
+ tag = "DROP TYPE";
+ break;
+ case DROP_DOMAIN:
+ tag = "DROP DOMAIN";
+ break;
+ default:
+ tag = "???";
+ }
break;
case T_TruncateStmt:
- tag = "TRUNCATE";
+ tag = "TRUNCATE TABLE";
break;
case T_CommentStmt:
@@ -2207,11 +2229,14 @@ CreateCommandTag(Node *parsetree)
break;
case T_RenameStmt:
- tag = "ALTER";
+ if (((RenameStmt *)parsetree)->renameType == RENAME_TRIGGER)
+ tag = "ALTER TRIGGER";
+ else
+ tag = "ALTER TABLE";
break;
case T_AlterTableStmt:
- tag = "ALTER";
+ tag = "ALTER TABLE";
break;
case T_GrantStmt:
@@ -2222,39 +2247,52 @@ CreateCommandTag(Node *parsetree)
break;
case T_DefineStmt:
- tag = "CREATE";
+ switch (((DefineStmt *) parsetree)->defType)
+ {
+ case AGGREGATE:
+ tag = "CREATE AGGREGATE";
+ break;
+ case OPERATOR:
+ tag = "CREATE OPERATOR";
+ break;
+ case TYPE_P:
+ tag = "CREATE TYPE";
+ break;
+ default:
+ tag = "???";
+ }
break;
- case T_ViewStmt: /* CREATE VIEW */
- tag = "CREATE";
+ case T_ViewStmt:
+ tag = "CREATE VIEW";
break;
- case T_CreateFunctionStmt: /* CREATE FUNCTION */
- tag = "CREATE";
+ case T_CreateFunctionStmt:
+ tag = "CREATE FUNCTION";
break;
- case T_IndexStmt: /* CREATE INDEX */
- tag = "CREATE";
+ case T_IndexStmt:
+ tag = "CREATE INDEX";
break;
- case T_RuleStmt: /* CREATE RULE */
- tag = "CREATE";
+ case T_RuleStmt:
+ tag = "CREATE RULE";
break;
case T_CreateSeqStmt:
- tag = "CREATE";
+ tag = "CREATE SEQUENCE";
break;
case T_RemoveAggrStmt:
- tag = "DROP";
+ tag = "DROP AGGREGATE";
break;
case T_RemoveFuncStmt:
- tag = "DROP";
+ tag = "DROP FUNCTION";
break;
case T_RemoveOperStmt:
- tag = "DROP";
+ tag = "DROP OPERATOR";
break;
case T_CreatedbStmt:
@@ -2307,31 +2345,41 @@ CreateCommandTag(Node *parsetree)
#endif
case T_VariableSetStmt:
- tag = "SET VARIABLE";
+ tag = "SET";
break;
case T_VariableShowStmt:
- tag = "SHOW VARIABLE";
+ tag = "SHOW";
break;
case T_VariableResetStmt:
- tag = "RESET VARIABLE";
+ tag = "RESET";
break;
case T_CreateTrigStmt:
- tag = "CREATE";
+ tag = "CREATE TRIGGER";
break;
case T_DropPropertyStmt:
- tag = "DROP";
+ switch (((DropPropertyStmt *) parsetree)->removeType)
+ {
+ case DROP_TRIGGER:
+ tag = "DROP TRIGGER";
+ break;
+ case DROP_RULE:
+ tag = "DROP RULE";
+ break;
+ default:
+ tag = "???";
+ }
break;
case T_CreatePLangStmt:
- tag = "CREATE";
+ tag = "CREATE LANGUAGE";
break;
case T_DropPLangStmt:
- tag = "DROP";
+ tag = "DROP LANGUAGE";
break;
case T_CreateUserStmt:
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index e8df96a53d..7a7f36e84c 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.52 2002/04/15 05:22:04 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.53 2002/05/18 15:44:48 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -227,7 +227,7 @@ ProcessQuery(Query *parsetree,
/* Set completion tag. SQL calls this operation DECLARE CURSOR */
if (completionTag)
- strcpy(completionTag, "DECLARE");
+ strcpy(completionTag, "DECLARE CURSOR");
return;
}