Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9ace031

Browse files
committed
Some small polishing of Mark Hollomon's cleanup of DROP command: might
as well allow DROP multiple INDEX, RULE, TYPE as well. Add missingCommandCounterIncrement to DROP loop, which could cause trouble otherwisewith multiple DROP of items affecting same catalog entries. Try tobring a little consistency to various error messages using 'does not exist','nonexistent', etc --- I standardized on 'does not exist' since that'swhat the vast majority of the existing uses seem to be.
1 parentee28d8b commit9ace031

File tree

18 files changed

+131
-169
lines changed

18 files changed

+131
-169
lines changed

‎doc/src/sgml/ref/drop_index.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.7 1999/07/2215:09:10 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.8 2000/10/2223:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -15,15 +15,15 @@ Postgres documentation
1515
DROP INDEX
1616
</refname>
1717
<refpurpose>
18-
Removesan index from a database
18+
Removesexisting indexes from a database
1919
</refpurpose>
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
2323
<date>1999-07-20</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
DROP INDEX <replaceable class="PARAMETER">index_name</replaceable>
26+
DROP INDEX <replaceable class="PARAMETER">index_name</replaceable> [, ...]
2727
</synopsis>
2828

2929
<refsect2 id="R2-SQL-DROPINDEX-1">
@@ -39,7 +39,7 @@ DROP INDEX <replaceable class="PARAMETER">index_name</replaceable>
3939
<term><replaceable class="PARAMETER">index_name</replaceable></term>
4040
<listitem>
4141
<para>
42-
The name ofthe index to remove.
42+
The name ofan index to remove.
4343
</para>
4444
</listitem>
4545
</varlistentry>
@@ -62,13 +62,13 @@ DROP
6262
</computeroutput></term>
6363
<listitem>
6464
<para>
65-
The message returned if theindex is successfully dropped.
65+
The message returned if thecommand completes successfully.
6666
</para>
6767
</listitem>
6868
</varlistentry>
6969
<varlistentry>
7070
<term><computeroutput>
71-
ERROR: index "<replaceable class="PARAMETER">index_name</replaceable>"nonexistent
71+
ERROR: index "<replaceable class="PARAMETER">index_name</replaceable>"does not exist
7272
</computeroutput></term>
7373
<listitem>
7474
<para>

‎doc/src/sgml/ref/drop_rule.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.7 2000/10/05 19:48:18 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.8 2000/10/22 23:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -15,15 +15,15 @@ Postgres documentation
1515
DROP RULE
1616
</refname>
1717
<refpurpose>
18-
Removesanexistingrule from the database
18+
Removes existingrules from the database
1919
</refpurpose>
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
2323
<date>1998-09-22</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
DROP RULE <replaceable class="PARAMETER">name</replaceable>
26+
DROP RULE <replaceable class="PARAMETER">name</replaceable> [, ...]
2727
</synopsis>
2828

2929
<refsect2 id="R2-SQL-DROPRULE-1">
@@ -68,7 +68,7 @@ DROP
6868
</varlistentry>
6969
<varlistentry>
7070
<term><computeroutput>
71-
ERROR:RewriteGetRuleEventRel: rule "<replaceable class="parameter">name</replaceable>" not found
71+
ERROR:Rule or view "<replaceable class="parameter">name</replaceable>" not found
7272
</computeroutput></term>
7373
<listitem>
7474
<para>

‎doc/src/sgml/ref/drop_sequence.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.7 2000/05/18 14:24:33 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.8 2000/10/22 23:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -15,7 +15,7 @@ Postgres documentation
1515
DROP SEQUENCE
1616
</refname>
1717
<refpurpose>
18-
Removesanexistingsequence
18+
Removes existingsequences from a database
1919
</refpurpose>
2020
</refnamediv>
2121
<refsynopsisdiv>
@@ -69,7 +69,7 @@ DROP
6969
</varlistentry>
7070
<varlistentry>
7171
<term><computeroutput>
72-
NOTICE: Relation "<replaceable class="parameter">name</replaceable>" does not exist.
72+
ERROR: sequence "<replaceable class="parameter">name</replaceable>" does not exist
7373
</computeroutput></term>
7474
<listitem>
7575
<para>

‎doc/src/sgml/ref/drop_table.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.8 2000/10/18 16:16:03 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.9 2000/10/22 23:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -68,7 +68,7 @@ DROP
6868
</varlistentry>
6969
<varlistentry>
7070
<term><computeroutput>
71-
ERROR: table "<replaceable class="parameter">name</replaceable>"is nonexistent
71+
ERROR: table "<replaceable class="parameter">name</replaceable>"does not exist
7272
</computeroutput></term>
7373
<listitem>
7474
<para>

‎doc/src/sgml/ref/drop_type.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.7 2000/07/2204:30:27 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.8 2000/10/2223:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -15,15 +15,15 @@ Postgres documentation
1515
DROP TYPE
1616
</refname>
1717
<refpurpose>
18-
Removesauser-definedtype from the system catalogs
18+
Removes user-definedtypes from the system catalogs
1919
</refpurpose>
2020
</refnamediv>
2121
<refsynopsisdiv>
2222
<refsynopsisdivinfo>
2323
<date>1999-07-20</date>
2424
</refsynopsisdivinfo>
2525
<synopsis>
26-
DROP TYPE <replaceable class="PARAMETER">typename</replaceable>
26+
DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...]
2727
</synopsis>
2828

2929
<refsect2 id="R2-SQL-DROPTYPE-1">

‎doc/src/sgml/ref/drop_view.sgml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.7 2000/10/18 16:16:03 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.8 2000/10/22 23:32:38 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -15,7 +15,7 @@ Postgres documentation
1515
DROP VIEW
1616
</refname>
1717
<refpurpose>
18-
Removesanexistingview from a database
18+
Removes existingviews from a database
1919
</refpurpose>
2020
</refnamediv>
2121
<refsynopsisdiv>
@@ -70,7 +70,7 @@ DROP
7070
</varlistentry>
7171
<varlistentry>
7272
<term><computeroutput>
73-
ERROR: view <replaceable class="parameter">name</replaceable>is nonexistent
73+
ERROR: view <replaceable class="parameter">name</replaceable>does not exist
7474
</computeroutput></term>
7575
<listitem>
7676
<para>
@@ -104,10 +104,6 @@ ERROR: view <replaceable class="parameter">name</replaceable> is nonexistent
104104
<title>
105105
Notes
106106
</title>
107-
<para>
108-
The <productname>Postgres</productname>
109-
<command>DROP TABLE</command> statement also drops views.
110-
</para>
111107
<para>
112108
Refer to <command>CREATE VIEW</command>
113109
for information on how to create views.

‎src/backend/catalog/heap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.149 2000/10/16 14:52:02 vadim Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.150 2000/10/22 23:32:38 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1091,7 +1091,7 @@ DeleteRelationTuple(Relation rel)
10911091
if (!HeapTupleIsValid(tup))
10921092
{
10931093
heap_close(pg_class_desc,RowExclusiveLock);
1094-
elog(ERROR,"Relation'%s' does not exist",
1094+
elog(ERROR,"Relation\"%s\" does not exist",
10951095
RelationGetRelationName(rel));
10961096
}
10971097

@@ -1342,7 +1342,7 @@ DeleteTypeTuple(Relation rel)
13421342
{
13431343
heap_endscan(pg_type_scan);
13441344
heap_close(pg_type_desc,RowExclusiveLock);
1345-
elog(ERROR,"DeleteTypeTuple:%s type nonexistent",
1345+
elog(ERROR,"DeleteTypeTuple:type \"%s\" does not exist",
13461346
RelationGetRelationName(rel));
13471347
}
13481348

‎src/backend/catalog/pg_operator.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.51 2000/08/21 17:22:35 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.52 2000/10/22 23:32:38 tgl Exp $
1212
*
1313
* NOTES
1414
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -181,7 +181,7 @@ OperatorGet(char *operatorName,
181181
leftObjectId=TypeGet(leftTypeName,&leftDefined);
182182

183183
if (!OidIsValid(leftObjectId)|| !leftDefined)
184-
elog(ERROR,"OperatorGet: left type'%s' nonexistent",
184+
elog(ERROR,"OperatorGet: left type\"%s\" does not exist",
185185
leftTypeName);
186186
}
187187

@@ -190,7 +190,7 @@ OperatorGet(char *operatorName,
190190
rightObjectId=TypeGet(rightTypeName,&rightDefined);
191191

192192
if (!OidIsValid(rightObjectId)|| !rightDefined)
193-
elog(ERROR,"OperatorGet: right type'%s' nonexistent",
193+
elog(ERROR,"OperatorGet: right type\"%s\" does not exist",
194194
rightTypeName);
195195
}
196196

@@ -527,7 +527,7 @@ OperatorDef(char *operatorName,
527527
leftTypeId=TypeGet(leftTypeName,&leftDefined);
528528

529529
if (!OidIsValid(leftTypeId)|| !leftDefined)
530-
elog(ERROR,"OperatorDef: left type'%s' nonexistent",
530+
elog(ERROR,"OperatorDef: left type\"%s\" does not exist",
531531
leftTypeName);
532532
}
533533

@@ -536,7 +536,7 @@ OperatorDef(char *operatorName,
536536
rightTypeId=TypeGet(rightTypeName,&rightDefined);
537537

538538
if (!OidIsValid(rightTypeId)|| !rightDefined)
539-
elog(ERROR,"OperatorDef: right type'%s' nonexistent",
539+
elog(ERROR,"OperatorDef: right type\"%s\" does not exist",
540540
rightTypeName);
541541
}
542542

@@ -739,7 +739,7 @@ OperatorDef(char *operatorName,
739739
otherRightTypeName);
740740
if (!OidIsValid(other_oid))
741741
elog(ERROR,
742-
"OperatorDef: can't create operator shell'%s'",
742+
"OperatorDef: can't create operator shell\"%s\"",
743743
name[j]);
744744
values[i++]=ObjectIdGetDatum(other_oid);
745745
}

‎src/backend/commands/indexcmds.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.38 2000/09/06 14:15:16 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.39 2000/10/22 23:32:39 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -610,7 +610,7 @@ RemoveIndex(char *name)
610610
0,0,0);
611611

612612
if (!HeapTupleIsValid(tuple))
613-
elog(ERROR,"index \"%s\"nonexistent",name);
613+
elog(ERROR,"index \"%s\"does not exist",name);
614614

615615
if (((Form_pg_class)GETSTRUCT(tuple))->relkind!=RELKIND_INDEX)
616616
{
@@ -640,7 +640,7 @@ ReindexIndex(const char *name, bool force /* currently unused */ )
640640
0,0,0);
641641

642642
if (!HeapTupleIsValid(tuple))
643-
elog(ERROR,"index \"%s\"nonexistent",name);
643+
elog(ERROR,"index \"%s\"does not exist",name);
644644

645645
if (((Form_pg_class)GETSTRUCT(tuple))->relkind!=RELKIND_INDEX)
646646
{
@@ -650,7 +650,7 @@ ReindexIndex(const char *name, bool force /* currently unused */ )
650650
}
651651

652652
if (!reindex_index(tuple->t_data->t_oid,force))
653-
elog(NOTICE,"index'%s' wasn't reindexed",name);
653+
elog(NOTICE,"index\"%s\" wasn't reindexed",name);
654654
}
655655

656656
/*
@@ -671,7 +671,7 @@ ReindexTable(const char *name, bool force)
671671
0,0,0);
672672

673673
if (!HeapTupleIsValid(tuple))
674-
elog(ERROR,"table \"%s\"nonexistent",name);
674+
elog(ERROR,"table \"%s\"does not exist",name);
675675

676676
if (((Form_pg_class)GETSTRUCT(tuple))->relkind!=RELKIND_RELATION)
677677
{
@@ -681,7 +681,7 @@ ReindexTable(const char *name, bool force)
681681
}
682682

683683
if (!reindex_relation(tuple->t_data->t_oid,force))
684-
elog(NOTICE,"table'%s' wasn't reindexed",name);
684+
elog(NOTICE,"table\"%s\" wasn't reindexed",name);
685685
}
686686

687687
/*
@@ -719,7 +719,7 @@ ReindexDatabase(const char *dbname, bool force, bool all)
719719
scan=heap_beginscan(relation,0,SnapshotNow,1,&scankey);
720720
dbtuple=heap_getnext(scan,0);
721721
if (!HeapTupleIsValid(dbtuple))
722-
elog(ERROR,"Database \"%s\"doesn't exist",dbname);
722+
elog(ERROR,"Database \"%s\"does not exist",dbname);
723723
db_id=dbtuple->t_data->t_oid;
724724
db_owner= ((Form_pg_database)GETSTRUCT(dbtuple))->datdba;
725725
heap_endscan(scan);
@@ -789,7 +789,7 @@ ReindexDatabase(const char *dbname, bool force, bool all)
789789
{
790790
StartTransactionCommand();
791791
if (reindex_relation(relids[i],force))
792-
elog(NOTICE,"relation %d was reindexed",relids[i]);
792+
elog(NOTICE,"relation %u was reindexed",relids[i]);
793793
CommitTransactionCommand();
794794
}
795795
StartTransactionCommand();

‎src/backend/commands/rename.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.50 2000/10/20 02:53:10 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.51 2000/10/22 23:32:39 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -137,7 +137,7 @@ renameatt(char *relname,
137137
PointerGetDatum(oldattname),
138138
0,0);
139139
if (!HeapTupleIsValid(oldatttup))
140-
elog(ERROR,"renameatt: attribute \"%s\"nonexistent",oldattname);
140+
elog(ERROR,"renameatt: attribute \"%s\"does not exist",oldattname);
141141

142142
if (((Form_pg_attribute)GETSTRUCT(oldatttup))->attnum<0)
143143
elog(ERROR,"renameatt: system attribute \"%s\" not renamed",oldattname);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp