Commitb651b2a

committed

Make sure we give an appropriate user-facing error when attempting

to drop a table that is referenced by an open cursor. Fix unstableecpg regression test result that was produced by this oversight.

1 parent2a6108a commitb651b2aCopy full SHA for b651b2a

File tree

+16

-5

lines changed

src
- backend/catalog
  - heap.c
- interfaces/ecpg/test/expected
  - sql-fetch.stderr

+16

-5

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.346 2008/11/27 15:59:28 heikki Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.347 2008/11/29 00:13:21 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1412,6 +1412,17 @@ heap_drop_with_catalog(Oid relid)`
`1412`	`1412`	`*/`
`1413`	`1413`	`rel=relation_open(relid,AccessExclusiveLock);`
`1414`	`1414`
	`1415`	`+/*`
	`1416`	`+ * There can no longer be anyone else touching the relation, but we`
	`1417`	`+ * might still have open queries or cursors in our own session.`
	`1418`	`+ */`
	`1419`	`+if (rel->rd_refcnt!=1)`
	`1420`	`+ereport(ERROR,`
	`1421`	`+(errcode(ERRCODE_OBJECT_IN_USE),`
	`1422`	`+errmsg("cannot drop \"%s\" because "`
	`1423`	`+"it is being used by active queries in this session",`
	`1424`	`+RelationGetRelationName(rel))));`
	`1425`	`+`
`1415`	`1426`	`/*`
`1416`	`1427`	`* Schedule unlinking of the relation's physical files at commit.`
`1417`	`1428`	`*/`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,10 @@`
`138`	`138`	`[NO_PID]: sqlca: code: 0, state: 00000`
`139`	`139`	`[NO_PID]: ecpg_execute on line 53: using PQexec`
`140`	`140`	`[NO_PID]: sqlca: code: 0, state: 00000`
`141`		`-[NO_PID]: ecpg_check_PQresult on line 53: ERROR:relation 16491isstill open`
	`141`	`+[NO_PID]: ecpg_check_PQresult on line 53: ERROR:cannot drop "my_table" because itisbeing used by active queries in this session`
`142`	`142`	`[NO_PID]: sqlca: code: 0, state: 00000`
`143`		`-[NO_PID]: raising sqlstateXX000 (sqlcode -400) on line 53:relation 16491isstill open on line 53`
`144`		`-[NO_PID]: sqlca: code: -400, state:XX000`
`145`		`-sql error:relation 16491isstill open on line 53`
	`143`	`+[NO_PID]: raising sqlstate55006 (sqlcode -400) on line 53:cannot drop "my_table" because itisbeing used by active queries in this session on line 53`
	`144`	`+[NO_PID]: sqlca: code: -400, state:55006`
	`145`	`+sql error:cannot drop "my_table" because itisbeing used by active queries in this session on line 53`
`146`	`146`	`[NO_PID]: ecpg_finish: connection regress1 closed`
`147`	`147`	`[NO_PID]: sqlca: code: 0, state: 00000`

Comments

(0)