|
10 | 10 | *
|
11 | 11 | *
|
12 | 12 | * IDENTIFICATION
|
13 |
| - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.99 2000/11/05 22:50:21 vadim Exp $ |
| 13 | + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.100 2000/11/07 02:17:50 tgl Exp $ |
14 | 14 | *
|
15 | 15 | *-------------------------------------------------------------------------
|
16 | 16 | */
|
@@ -80,11 +80,14 @@ DropErrorMsg(char* relname, char wrongkind, char rightkind)
|
80 | 80 | for (wentry = kindstringarray; wentry->kind != '\0'; wentry++)
|
81 | 81 | if (wentry->kind == wrongkind)
|
82 | 82 | break;
|
83 |
| - Assert(wentry->kind != '\0'); |
84 |
| - |
85 |
| - elog(ERROR, "\"%s\" is not %s %s. Use DROP %s to remove %s %s", |
86 |
| - relname, rentry->indef_article, rentry->name, |
87 |
| - wentry->command, wentry->indef_article, wentry->name); |
| 83 | + /* wrongkind could be something we don't have in our table... */ |
| 84 | + if (wentry->kind != '\0') |
| 85 | + elog(ERROR, "\"%s\" is not %s %s. Use DROP %s to remove %s %s", |
| 86 | + relname, rentry->indef_article, rentry->name, |
| 87 | + wentry->command, wentry->indef_article, wentry->name); |
| 88 | + else |
| 89 | + elog(ERROR, "\"%s\" is not %s %s", |
| 90 | + relname, rentry->indef_article, rentry->name); |
88 | 91 | }
|
89 | 92 |
|
90 | 93 | static void
|
|
0 commit comments