diff options
| author | Bruce Momjian <bruce@momjian.us> | 2017-05-17 16:31:56 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2017-05-17 16:31:56 -0400 |
| commit | a6fd7b7a5f7bf3a8aa3f3d076cf09d922c1c6dd2 (patch) | |
| tree | d10454411c05d459abe06df161ab3c1156c5f477 /src/backend/commands/dropcmds.c | |
| parent | 8a943324780259757c77c56cfc597347d1150cdb (diff) | |
| download | postgresql-a6fd7b7a5f7bf3a8aa3f3d076cf09d922c1c6dd2.tar.gz postgresql-a6fd7b7a5f7bf3a8aa3f3d076cf09d922c1c6dd2.zip | |
Post-PG 10 beta1 pgindent run
perltidy run not included.
Diffstat (limited to 'src/backend/commands/dropcmds.c')
| -rw-r--r-- | src/backend/commands/dropcmds.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c index a1a64fa8c9e..9e307eb8af8 100644 --- a/src/backend/commands/dropcmds.c +++ b/src/backend/commands/dropcmds.c @@ -102,7 +102,7 @@ RemoveObjects(DropStmt *stmt) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("\"%s\" is an aggregate function", - NameListToString(castNode(ObjectWithArgs, object)->objname)), + NameListToString(castNode(ObjectWithArgs, object)->objname)), errhint("Use DROP AGGREGATE to drop aggregate functions."))); ReleaseSysCache(tup); @@ -145,7 +145,7 @@ owningrel_does_not_exist_skipping(List *object, const char **msg, char **name) RangeVar *parent_rel; parent_object = list_truncate(list_copy(object), - list_length(object) - 1); + list_length(object) - 1); if (schema_does_not_exist_skipping(parent_object, msg, name)) return true; @@ -328,6 +328,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) case OBJECT_FUNCTION: { ObjectWithArgs *owa = castNode(ObjectWithArgs, object); + if (!schema_does_not_exist_skipping(owa->objname, &msg, &name) && !type_in_list_does_not_exist_skipping(owa->objargs, &msg, &name)) { @@ -340,6 +341,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) case OBJECT_AGGREGATE: { ObjectWithArgs *owa = castNode(ObjectWithArgs, object); + if (!schema_does_not_exist_skipping(owa->objname, &msg, &name) && !type_in_list_does_not_exist_skipping(owa->objargs, &msg, &name)) { @@ -352,6 +354,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) case OBJECT_OPERATOR: { ObjectWithArgs *owa = castNode(ObjectWithArgs, object); + if (!schema_does_not_exist_skipping(owa->objname, &msg, &name) && !type_in_list_does_not_exist_skipping(owa->objargs, &msg, &name)) { @@ -390,7 +393,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) msg = gettext_noop("trigger \"%s\" for relation \"%s\" does not exist, skipping"); name = strVal(llast(castNode(List, object))); args = NameListToString(list_truncate(list_copy(castNode(List, object)), - list_length(castNode(List, object)) - 1)); + list_length(castNode(List, object)) - 1)); } break; case OBJECT_POLICY: @@ -399,7 +402,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) msg = gettext_noop("policy \"%s\" for relation \"%s\" does not exist, skipping"); name = strVal(llast(castNode(List, object))); args = NameListToString(list_truncate(list_copy(castNode(List, object)), - list_length(castNode(List, object)) - 1)); + list_length(castNode(List, object)) - 1)); } break; case OBJECT_EVENT_TRIGGER: @@ -412,7 +415,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) msg = gettext_noop("rule \"%s\" for relation \"%s\" does not exist, skipping"); name = strVal(llast(castNode(List, object))); args = NameListToString(list_truncate(list_copy(castNode(List, object)), - list_length(castNode(List, object)) - 1)); + list_length(castNode(List, object)) - 1)); } break; case OBJECT_FDW: |