NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitacc67ff

committed

Give more accurate error message for dropping pinned portal

The previous code gave the same error message for attempting to droppinned and active portals, but those are separate states, so giveseparate error messages.

1 parentd16c2de commitacc67ffCopy full SHA for acc67ff

File tree

1 file changed

+10

-4

lines changed

src/backend/utils/mmgr
- portalmem.c

1 file changed

+10

-4

lines changed

`‎src/backend/utils/mmgr/portalmem.c‎`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -464,11 +464,17 @@ PortalDrop(Portal portal, bool isTopCommit)`
`464`	`464`
`465`	`465`	`/*`
`466`	`466`	`* Don't allow dropping a pinned portal, it's still needed by whoever`
`467`		`- * pinned it. Not sure if the PORTAL_ACTIVE case can validly happen or`
`468`		`- * not...`
	`467`	`+ * pinned it.`
`469`	`468`	`*/`
`470`		`-if (portal->portalPinned\|\|`
`471`		`-portal->status==PORTAL_ACTIVE)`
	`469`	`+if (portal->portalPinned)`
	`470`	`+ereport(ERROR,`
	`471`	`+(errcode(ERRCODE_INVALID_CURSOR_STATE),`
	`472`	`+errmsg("cannot drop pinned portal \"%s\"",portal->name)));`
	`473`	`+`
	`474`	`+/*`
	`475`	`+ * Not sure if the PORTAL_ACTIVE case can validly happen or not...`
	`476`	`+ */`
	`477`	`+if (portal->status==PORTAL_ACTIVE)`
`472`	`478`	`ereport(ERROR,`
`473`	`479`	`(errcode(ERRCODE_INVALID_CURSOR_STATE),`
`474`	`480`	`errmsg("cannot drop active portal \"%s\"",portal->name)));`

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!

Commitacc67ff

File tree

1 file changed

1 file changed

`‎src/backend/utils/mmgr/portalmem.c‎`

0 commit comments