database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Fix DROP OPERATOR FAMILY IF EXISTS.

Browse Source 
Essentially, the "IF EXISTS" portion was being ignored, and an error
thrown anyway if the opfamily did not exist.

I broke this in commit fd1843ff8979c0461fb3f1a9eab61140c977e32d; so
backpatch to 9.1.X.

Report and diagnosis by KaiGai Kohei.
This commit is contained in:
Robert Haas 2011-10-21 09:10:46 -04:00
parent b4a0223d00
commit 980261929f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/commands/opclasscmds.c
View File

@ -1613,10 +1613,9 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt)
tuple = OpFamilyCacheLookup(amID, stmt->opfamilyname, stmt->missing_ok); tuple = OpFamilyCacheLookup(amID, stmt->opfamilyname, stmt->missing_ok);
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
{ {
ereport(ERROR, ereport(NOTICE,
(errcode(ERRCODE_UNDEFINED_OBJECT), (errmsg("operator family \"%s\" does not exist for access method \"%s\", skipping",
errmsg("operator family \"%s\" does not exist for access method \"%s\"", NameListToString(stmt->opfamilyname), stmt->amname)));
NameListToString(stmt->opfamilyname), stmt->amname)));
return; return;
} }

2
src/test/regress/expected/drop_if_exists.out
View File

@ -214,7 +214,7 @@ ERROR: access method "no_such_am" does not exist
DROP OPERATOR FAMILY test_operator_family USING btree; DROP OPERATOR FAMILY test_operator_family USING btree;
ERROR: operator family "test_operator_family" does not exist for access method "btree" ERROR: operator family "test_operator_family" does not exist for access method "btree"
DROP OPERATOR FAMILY IF EXISTS test_operator_family USING btree; DROP OPERATOR FAMILY IF EXISTS test_operator_family USING btree;
ERROR: operator family "test_operator_family" does not exist for access method "btree" NOTICE: operator family "test_operator_family" does not exist for access method "btree", skipping
DROP OPERATOR FAMILY test_operator_family USING no_such_am; DROP OPERATOR FAMILY test_operator_family USING no_such_am;
ERROR: access method "no_such_am" does not exist ERROR: access method "no_such_am" does not exist
DROP OPERATOR FAMILY IF EXISTS test_operator_family USING no_such_am; DROP OPERATOR FAMILY IF EXISTS test_operator_family USING no_such_am;