Properly fix first()'s handling of extracted count.

James William Pye · James William Pye · commit 5fc0ce697600 · 2010-03-29T14:44:11.000-07:00
Bad logic returned the command tag instead of zero.
diff --git a/postgresql/documentation/changes.txt b/postgresql/documentation/changes.txt
@@ -4,7 +4,8 @@ Changes
 1.0.1 in development
 --------------------
 
- * <No changes>
+ * First .first()'s handling of counts and commands.
+   Bad logic caused zero-counts to return the command tag.
 
 1.0 release on 2010-03-27
 -------------------------
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1593,7 +1593,13 @@ def first(self, *parameters):
 			else:
 				# Probably a Null command.
 				return None
-			return cm.extract_count() or cm.extract_command()
+
+			count = cm.extract_count()
+			if count is None:
+				command = cm.extract_command()
+				if command is not None:
+					return command.decode('ascii')
+			return count
 
 	def _load_copy_chunks(self, chunks, *parameters):
 		"""
diff --git a/postgresql/test/test_driver.py b/postgresql/test/test_driver.py
@@ -424,7 +424,8 @@ def testStatementCall(self):
 
 	@pg_tmp
 	def testStatementFirstDML(self):
-		db.execute("CREATE TEMP TABLE first (i int)")
+		cmd = prepare("CREATE TEMP TABLE first (i int)").first()
+		self.failUnlessEqual(cmd, 'CREATE TABLE')
 		fins = db.prepare("INSERT INTO first VALUES (123)").first
 		fupd = db.prepare("UPDATE first SET i = 321 WHERE i = 123").first
 		fdel = db.prepare("DELETE FROM first").first
@@ -436,6 +437,7 @@ def testStatementFirstDML(self):
 		self.failUnlessEqual(fins(), 1)
 		self.failUnlessEqual(fupd(), 2)
 		self.failUnlessEqual(fdel(), 3)
+		self.failUnlessEqual(fdel(), 0)
 
 	@pg_tmp
 	def testStatementRowsPersistence(self):
