Fix DROP OPERATOR FAMILY IF EXISTS.

robertmhaas · robertmhaas · commit 980261929f2b · 2011-10-21T09:12:23.000-04:00
Essentially, the "IF EXISTS" portion was being ignored, and an error thrown anyway if the opfamily did not exist. I broke this in commit fd1843f; so backpatch to 9.1.X. Report and diagnosis by KaiGai Kohei.
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
@@ -1613,10 +1613,9 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt)
 	tuple = OpFamilyCacheLookup(amID, stmt->opfamilyname, stmt->missing_ok);
 	if (!HeapTupleIsValid(tuple))
 	{
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("operator family \"%s\" does not exist for access method \"%s\"",
-						NameListToString(stmt->opfamilyname), stmt->amname)));
+		ereport(NOTICE,
+				(errmsg("operator family \"%s\" does not exist for access method \"%s\", skipping",
+				   NameListToString(stmt->opfamilyname), stmt->amname)));
 		return;
 	}
 
diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out
@@ -214,7 +214,7 @@ ERROR:  access method "no_such_am" does not exist
 DROP OPERATOR FAMILY test_operator_family USING btree;
 ERROR:  operator family "test_operator_family" does not exist for access method "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;
 ERROR:  access method "no_such_am" does not exist
 DROP OPERATOR FAMILY IF EXISTS test_operator_family USING no_such_am;

Original file line number	Diff line number	Diff line change
`@@ -1613,10 +1613,9 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt)`
`1613`	`1613`	`tuple = OpFamilyCacheLookup(amID, stmt->opfamilyname, stmt->missing_ok);`
`1614`	`1614`	`if (!HeapTupleIsValid(tuple))`
`1615`	`1615`	`{`
`1616`		`- ereport(ERROR,`
`1617`		`- (errcode(ERRCODE_UNDEFINED_OBJECT),`
`1618`		`- errmsg("operator family \"%s\" does not exist for access method \"%s\"",`
`1619`		`- NameListToString(stmt->opfamilyname), stmt->amname)));`
	`1616`	`+ ereport(NOTICE,`
	`1617`	`+ (errmsg("operator family \"%s\" does not exist for access method \"%s\", skipping",`
	`1618`	`+ NameListToString(stmt->opfamilyname), stmt->amname)));`
`1620`	`1619`	`return;`
`1621`	`1620`	`}`
`1622`	`1621`