Merge branch 'v0.9' into v1.0

James William Pye · James William Pye · commit a4a930c455d4 · 2009-12-20T16:31:24.000-07:00
Fix savepoint identification, so that savepoints actually work.

Conflicts:
	postgresql/documentation/changes.txt
diff --git a/postgresql/documentation/changes.txt b/postgresql/documentation/changes.txt
@@ -7,6 +7,13 @@ Changes
  * Added db.do() method for DO-statement support(convenience method).
  * **DEPRECATION**: Removed 2PC support documentation.
 
+0.9.3
+-----
+
+ * Fix inconsistency in savepoint identification by pq3.Transaction.
+   Savepoints via db.xact() were broken.
+   [Reported by Elvis Pranskevichus]
+
 0.9.2 released on 2009-12-14
 ----------------------------
 
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1541,7 +1541,7 @@ def _start_xact_string(isolation = None, mode = None):
 
 	@staticmethod
 	def _savepoint_xact_string(id):
-		return 'SAVEPOINT "' + id.replace('"', '""') + '";'
+		return 'SAVEPOINT "xact(' + id.replace('"', '""') + ')";'
 
 	def start(self):
 		if self.state == 'open':
@@ -1657,7 +1657,7 @@ def commit(self):
 
 	@staticmethod
 	def _rollback_to_string(id):
-		return 'ROLLBACK TO "' + id.replace('"', '""') + '";'
+		return 'ROLLBACK TO "xact(' + id.replace('"', '""') + ')";'
 
 	def rollback(self):
 		if self.state == 'aborted':
diff --git a/postgresql/test/test_driver.py b/postgresql/test/test_driver.py
@@ -666,6 +666,10 @@ def testProcExecutionInXact(self):
 		with self.db.xact():
 			self.testProcExecution()
 
+	def testProcExecutionInSubXact(self):
+		with self.db.xact(), self.db.xact():
+			self.testProcExecution()
+
 	def testNULL(self):
 		# Directly commpare (SELECT NULL) is None
 		self.failUnless(
@@ -1300,6 +1304,29 @@ def testFailedSubtransactionBlock(self):
 				# driver should have released/aborted instead
 				self.failUnlessEqual(err.source, 'CLIENT')
 
+	def testSuccessfulSubtransactionBlock(self):
+		with self.db.xact():
+			with self.db.xact():
+				self.db.execute("create temp table subxact_sx1(i int);")
+				with self.db.xact():
+					self.db.execute("create temp table subxact_sx2(i int);")
+					# And, because I'm paranoid.
+					# The following block is used to make sure
+					# that savepoints are actually being set.
+					try:
+						with self.db.xact():
+							self.db.execute("selekt 1")
+					except pg_exc.SyntaxError:
+						# Just in case the xact() aren't doing anything.
+						pass
+			with self.db.xact():
+				self.db.execute("create temp table subxact_sx3(i int);")
+		# if it can't drop these tables, it didn't manage the subxacts
+		# properly.
+		self.db.execute("drop table subxact_sx1")
+		self.db.execute("drop table subxact_sx2")
+		self.db.execute("drop table subxact_sx3")
+
 	def testCloseInSubTransactionBlock(self):
 		try:
 			with self.db.xact():
