Release rolled back savepoints.

James William Pye · James William Pye · commit 128ee90dca91 · 2010-07-17T01:26:30.000-07:00
fixes #45
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -2169,8 +2169,8 @@ def commit(self):
 		self.state = 'committed'
 
 	@staticmethod
-	def _rollback_to_string(id):
-		return 'ROLLBACK TO "xact(' + id.replace('"', '""') + ')";'
+	def _rollback_to_string(id, fmt = 'ROLLBACK TO "xact({0})"; RELEASE "xact({0})";'.format):
+		return fmt(id.replace('"', '""'))
 
 	def rollback(self):
 		if self.state == 'aborted':
diff --git a/postgresql/test/test_driver.py b/postgresql/test/test_driver.py
@@ -1510,6 +1510,23 @@ def testSuccessfulSubtransactionBlock(self):
 		db.execute("drop table subxact_sx2")
 		db.execute("drop table subxact_sx3")
 
+	@pg_tmp
+	def testReleasedSavepoint(self):
+		# validate that the rolled back savepoint is released as well.
+		x = None
+		with db.xact():
+			try:
+				with db.xact():
+					try:
+						with db.xact() as x:
+							db.execute("selekt 1")
+					except pg_exc.SyntaxError:
+						db.execute('RELEASE "xact(' + hex(id(x)) + ')"')
+			except pg_exc.InvalidSavepointSpecificationError as e:
+				pass
+			else:
+				self.fail("InvalidSavepointSpecificationError not raised")
+
 	@pg_tmp
 	def testCloseInSubTransactionBlock(self):
 		try:
