Revise command completion tags as per hackers message on 20 March.

doc/src/sgml/ref/alter_table.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.44 2002/04/24 02:40:45 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.45 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -141,7 +141,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><computeroutput>ALTER</computeroutput></term>
+      <term><computeroutput>ALTER TABLE</computeroutput></term>
       <listitem>
        <para>
 	Message returned from column or table renaming.

doc/src/sgml/ref/alter_trigger.sgml

@@ -78,7 +78,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">trigger</replaceable> ON <replaceab
 
     <variablelist>
      <varlistentry>
-      <term><computeroutput>ALTER</computeroutput></term>
+      <term><computeroutput>ALTER TRIGGER</computeroutput></term>
       <listitem>
        <para>
 	Message returned from trigger renaming.

doc/src/sgml/ref/close.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.12 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.13 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -58,7 +58,7 @@ CLOSE <replaceable class="PARAMETER">cursor</replaceable>
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CLOSE
+CLOSE CURSOR
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_aggregate.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.19 2002/04/23 02:07:15 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.20 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -134,7 +134,7 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( BASETYPE =
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE AGGREGATE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_constraint.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.7 2002/04/23 02:07:15 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.8 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -101,7 +101,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE CONSTRAINT
+CREATE TRIGGER
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_index.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.30 2002/04/23 02:07:15 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.31 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -174,7 +174,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE INDEX
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_language.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.22 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.23 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -125,7 +125,7 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">langna
      <msgmain>
       <msgtext>
 <screen>
-CREATE
+CREATE LANGUAGE
 </screen>
       </msgtext>
      </msgmain>

doc/src/sgml/ref/create_operator.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.28 2002/04/23 02:07:15 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.29 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -176,7 +176,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( PROCEDURE = <replaceable class
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE OPERATOR
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_rule.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.35 2002/04/19 23:13:53 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.36 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -121,7 +121,7 @@ NOTHING
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE RULE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_schema.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.1 2002/04/25 21:47:07 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.2 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -75,7 +75,7 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE SCHEMA
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_sequence.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.27 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.28 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -161,7 +161,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE SEQUENCE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_table.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.54 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.55 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -503,7 +503,7 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
     <msg>
      <msgmain>
       <msgtext>
-       <simpara><computeroutput>CREATE</computeroutput></simpara>
+       <simpara><computeroutput>CREATE TABLE</computeroutput></simpara>
       </msgtext>
      </msgmain>
     </msg>

doc/src/sgml/ref/create_trigger.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.25 2002/04/24 02:49:50 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.26 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -98,7 +98,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE TRIGGER
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_type.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.28 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.29 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -186,7 +186,7 @@ CREATE TYPE <replaceable class="parameter">typename</replaceable> ( INPUT = <rep
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE TYPE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/create_view.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.17 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.18 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -81,7 +81,7 @@ class="PARAMETER">column name list</replaceable> ) ] AS SELECT <replaceable clas
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-CREATE
+CREATE VIEW
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/declare.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.17 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.18 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -140,7 +140,7 @@ DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INS
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-SELECT
+DECLARE CURSOR
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_aggregate.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.17 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.18 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -69,7 +69,7 @@ DROP AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( <replaceable
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP AGGREGATE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_domain.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.5 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.6 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -77,7 +77,7 @@ DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ C
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP DOMAIN
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_function.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.19 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.20 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -65,7 +65,7 @@ DROP FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceable
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP FUNCTION
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_index.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.14 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.15 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -56,7 +56,7 @@ DROP INDEX <replaceable class="PARAMETER">index_name</replaceable> [, ...]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP INDEX
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_language.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.13 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.14 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -58,7 +58,7 @@ DROP [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">name</replaceable>
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP LANGUAGE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_operator.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.15 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.16 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -76,7 +76,7 @@ DROP OPERATOR <replaceable class="PARAMETER">id</replaceable> ( <replaceable cla
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP OPERATOR
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_rule.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.14 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.15 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -65,7 +65,7 @@ DROP RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable clas
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP RULE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_sequence.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.13 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.14 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -57,7 +57,7 @@ DROP SEQUENCE <replaceable class="PARAMETER">name</replaceable> [, ...]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP SEQUENCE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_table.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.14 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.15 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -56,7 +56,7 @@ DROP TABLE <replaceable class="PARAMETER">name</replaceable> [, ...]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP TABLE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_trigger.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.11 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.12 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -66,7 +66,7 @@ DROP TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable c
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP TRIGGER
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_type.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.16 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.17 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -56,7 +56,7 @@ DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP TYPE
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/drop_view.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.13 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.14 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -58,7 +58,7 @@ DROP VIEW <replaceable class="PARAMETER">name</replaceable> [, ...]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-DROP
+DROP VIEW
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/rollback.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/rollback.sgml,v 1.12 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/rollback.sgml,v 1.13 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -48,7 +48,7 @@ ROLLBACK [ WORK | TRANSACTION ]
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-ABORT
+ROLLBACK
        </computeroutput></term>
       <listitem>
        <para>

doc/src/sgml/ref/set.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.60 2002/05/17 01:19:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.61 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -401,7 +401,7 @@ SELECT setseed(<replaceable>value</replaceable>);
     
    <variablelist>
     <varlistentry>
-     <term><computeroutput>SET VARIABLE</computeroutput></term>
+     <term><computeroutput>SET</computeroutput></term>
      <listitem>
       <para>
        Message returned if successful.

doc/src/sgml/ref/truncate.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/truncate.sgml,v 1.7 2002/04/23 02:07:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/truncate.sgml,v 1.8 2002/05/18 15:44:47 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -58,7 +58,7 @@ TRUNCATE [ TABLE ] <replaceable class="PARAMETER">name</replaceable>
     <variablelist>
      <varlistentry>
       <term><computeroutput>
-TRUNCATE
+TRUNCATE TABLE
        </computeroutput></term>
       <listitem>
        <para>

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:

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;
 	}