NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit9802619

committed

Fix DROP OPERATOR FAMILY IF EXISTS.

Essentially, the "IF EXISTS" portion was being ignored, and an errorthrown anyway if the opfamily did not exist.I broke this in commitfd1843f; sobackpatch to 9.1.X.Report and diagnosis by KaiGai Kohei.

1 parentb4a0223 commit9802619Copy full SHA for 9802619

File tree

2 files changed

-5

lines changed

src
- backend/commands
  - opclasscmds.c
- test/regress/expected
  - drop_if_exists.out

2 files changed

-5

lines changed

`‎src/backend/commands/opclasscmds.c`

Lines changed: 3 additions & 4 deletions

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`

`‎src/test/regress/expected/drop_if_exists.out`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ ERROR: access method "no_such_am" does not exist`
`214`	`214`	`DROP OPERATOR FAMILY test_operator_family USING btree;`
`215`	`215`	`ERROR: operator family "test_operator_family" does not exist for access method "btree"`
`216`	`216`	`DROP OPERATOR FAMILY IF EXISTS test_operator_family USING btree;`
`217`		`-ERROR: operator family "test_operator_family" does not exist for access method "btree"`
	`217`	`+NOTICE: operator family "test_operator_family" does not exist for access method "btree", skipping`
`218`	`218`	`DROP OPERATOR FAMILY test_operator_family USING no_such_am;`
`219`	`219`	`ERROR: access method "no_such_am" does not exist`
`220`	`220`	`DROP OPERATOR FAMILY IF EXISTS test_operator_family USING no_such_am;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9802619

File tree

2 files changed

2 files changed

`‎src/backend/commands/opclasscmds.c`

`‎src/test/regress/expected/drop_if_exists.out`

0 commit comments