From 2c50f6344b4160dc8748b9a12db64fa2e94b46e0 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 18 May 2002 15:44:48 +0000
Subject: [PATCH] Revise command completion tags as per hackers message on 20
March.
---
doc/src/sgml/ref/alter_table.sgml | 4 +-
doc/src/sgml/ref/alter_trigger.sgml | 2 +-
doc/src/sgml/ref/close.sgml | 4 +-
doc/src/sgml/ref/create_aggregate.sgml | 4 +-
doc/src/sgml/ref/create_constraint.sgml | 4 +-
doc/src/sgml/ref/create_index.sgml | 4 +-
doc/src/sgml/ref/create_language.sgml | 4 +-
doc/src/sgml/ref/create_operator.sgml | 4 +-
doc/src/sgml/ref/create_rule.sgml | 4 +-
doc/src/sgml/ref/create_schema.sgml | 4 +-
doc/src/sgml/ref/create_sequence.sgml | 4 +-
doc/src/sgml/ref/create_table.sgml | 4 +-
doc/src/sgml/ref/create_trigger.sgml | 4 +-
doc/src/sgml/ref/create_type.sgml | 4 +-
doc/src/sgml/ref/create_view.sgml | 4 +-
doc/src/sgml/ref/declare.sgml | 4 +-
doc/src/sgml/ref/drop_aggregate.sgml | 4 +-
doc/src/sgml/ref/drop_domain.sgml | 4 +-
doc/src/sgml/ref/drop_function.sgml | 4 +-
doc/src/sgml/ref/drop_index.sgml | 4 +-
doc/src/sgml/ref/drop_language.sgml | 4 +-
doc/src/sgml/ref/drop_operator.sgml | 4 +-
doc/src/sgml/ref/drop_rule.sgml | 4 +-
doc/src/sgml/ref/drop_sequence.sgml | 4 +-
doc/src/sgml/ref/drop_table.sgml | 4 +-
doc/src/sgml/ref/drop_trigger.sgml | 4 +-
doc/src/sgml/ref/drop_type.sgml | 4 +-
doc/src/sgml/ref/drop_view.sgml | 4 +-
doc/src/sgml/ref/rollback.sgml | 4 +-
doc/src/sgml/ref/set.sgml | 4 +-
doc/src/sgml/ref/truncate.sgml | 4 +-
src/backend/tcop/postgres.c | 106 +++++++++++++++++-------
src/backend/tcop/pquery.c | 4 +-
33 files changed, 140 insertions(+), 92 deletions(-)
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index b0174bcd1e9..4966eb757b8 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,5 +1,5 @@
<!--
-$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.
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 8cf5168a5be..cdfbb792c74 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/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.
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 6e1204a7ad2..e82bb4d90ed 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index 0c326b6f8db..21c547f6b67 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml
index c5af73ad42a..0e86c93f01e 100644
--- a/doc/src/sgml/ref/create_constraint.sgml
+++ b/doc/src/sgml/ref/create_constraint.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 637d4965a40..a3af001006a 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 4fc6399f3de..e5f47be9ffe 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index b1371140f1e..82ea44921d9 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index ae9571a7c58..86046359b4a 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 64f96b34d9a..daecc3b0d40 100644
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 5df6618bfa8..3db79850c8a 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 936fe1ba3cc..5ef7a5d6e70 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 243fe85271f..e9f66d95b48 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 82847df7d76..042a8fd51d6 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index f7fa744366a..aa7c869285f 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index fee93fcbaba..77c45d90b09 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index b39daaaeb9e..857a7f10f48 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index 0a74649f95d..5bc73a065fa 100644
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 14c6f451c98..268d8c66e8c 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index 99336704cf1..0db2c609461 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 26668d5995c..08badab8083 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index 5383d3bea34..bc4657038fd 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index 1596b460c40..4f8ea97f88d 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index 669d4962a57..4c371164e1e 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index 20de8b484ca..cae3275067d 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 30c92605497..e4f157b1d7c 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index 9d88fc85b96..3ac0f17ae9f 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 5d168628fdb..a789e38c4ce 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 9575386d3be..2f14ead6843 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index f54f70c1979..65ff6eca29f 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -1,5 +1,5 @@
<!--
-$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.
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index a3888b7d320..723079ab3bc 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -1,5 +1,5 @@
<!--
-$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>
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 1ea4fa9a6b5..f5d00a300e3 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 e8df96a53de..7a7f36e84c3 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;
}
--
GitLab