Raise Error when operations are performed on closed cursors.

James William Pye · James William Pye · commit 406c557ac8e7 · 2009-06-14T02:25:51.000-07:00
spec says so, and the recent portal change was causing a failure on close, so
wrap it up with better spec compliance yay
diff --git a/postgresql/driver/dbapi20.py b/postgresql/driver/dbapi20.py
@@ -144,13 +144,19 @@ def __init__(self, C):
 	def _portal():
 		def fget(self):
 			if self.__portals is None:
-				raise Error("access on closed cursor")
+				raise Error("cursor is closed",
+					source = 'CLIENT', creator = self.database
+				)
 			try:
 				p = self.__portals[0]
 			except IndexError:
 				raise InterfaceError("no portal on stack")
 			return p
 		def fdel(self):
+			if self.__portals is None:
+				raise Error("cursor is closed",
+					source = 'CLIENT', creator = self.database
+				)
 			try:
 				del self.__portals[0]
 			except IndexError:
@@ -159,15 +165,23 @@ def fdel(self):
 	_portal = property(**_portal())
 
 	def setinputsizes(self, sizes):
-		pass
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
 
 	def setoutputsize(self, sizes, columns = None):
-		pass
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
 
 	def callproc(self, proname, args):
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
+
 		p = self.database.prepare("SELECT %s(%s)" %(
 			proname, ','.join([
-				'$%d' %(x,) for x in range(1, len(args) + 1)
+				'$' + str(x) for x in range(1, len(args) + 1)
 			])
 		))
 		self.__portals.insert(0, Portal(p.chunks(*args)))
@@ -245,6 +259,10 @@ def _convert_query(self, string):
 		return (pg_str.unsplit(rparts) if rparts else string, transformer, count)
 
 	def execute(self, statement, parameters = ()):
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
+
 		sql, pxf, nparams = self._convert_query(statement)
 		if nparams != -1 and len(parameters) != nparams:
 			raise TypeError(
@@ -274,6 +292,10 @@ def execute(self, statement, parameters = ()):
 		return self
 
 	def executemany(self, statement, parameters):
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
+
 		sql, pxf, nparams = self._convert_query(statement)
 		ps = self.database.prepare(sql)
 		if ps._input is not None:
@@ -284,11 +306,11 @@ def executemany(self, statement, parameters):
 		return self
 
 	def close(self):
+		if self.__portals is None:
+			raise Error("cursor is closed",
+				source = 'CLIENT', creator = self.database)
 		self.description = None
-		ps = self.__portals
-		if self.__portals is not None:
-			self.__portals = None
-			for p in ps: p.close()
+		self.__portals = None
 
 class Connection(Connection):
 	"""
diff --git a/postgresql/test/test_dbapi20.py b/postgresql/test/test_dbapi20.py
@@ -342,6 +342,25 @@ def test_close(self):
 		# connection.close should raise an Error if called more than once
 		self.assertRaises(self.driver.Error,con.close)
 
+	def test_cursor_close(self):
+		con = self._connect()
+		try:
+			cur = con.cursor()
+			cur.close()
+			# cursor.execute should raise an Error if called after cursor.close
+			# closed
+			self.assertRaises(self.driver.Error,self.executeDDL1,cur)
+			# cursor.executemany should raise an Error if called after connection'
+			# closed.'
+			self.assertRaises(self.driver.Error,cur.executemany,'foo', [])
+
+			self.assertRaises(self.driver.Error,cur.callproc,'generate_series', [1, 10])
+
+			# cursor.close should raise an Error if called more than once
+			self.assertRaises(self.driver.Error,cur.close)
+		finally:
+			con.close()
+
 	def test_execute(self):
 		con = self._connect()
 		try:
