python-postgres
diff --git a/‎postgresql/documentation/changes.txt‎
Lines changed: 2 additions & 0 deletions b/‎postgresql/documentation/changes.txt‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎postgresql/driver/dbapi20.py‎
Lines changed: 7 additions & 2 deletions b/‎postgresql/driver/dbapi20.py‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎postgresql/test/test_dbapi20.py‎
Lines changed: 13 additions & 4 deletions b/‎postgresql/test/test_dbapi20.py‎
Lines changed: 13 additions & 4 deletions
@@ -21,6 +21,7 @@ Changes
  * Make DB-API connect() inherit defaults like postgresql.open()
  * Make DB-API extend PG-API so that DB-API connections will now have direct
    access to PG-API features.
+ * Fix DB-API setting of rowcount after execute. [Reported by Mike Bayer; 1010643]
 
 
 0.8.2
@@ -29,6 +30,7 @@ Changes
  * Correct StoredProcedure's statement production. It was falsely using a
    a mechanism that would use SQL predefined type names instead of
    qualified names. [Reported by Dallas Morisett]
+ * Fix DB-API setting of rowcount after execute. [Reported by Mike Bayer; 1010643]
 
 
 0.8.1 released on 2009-04-30
 
@@ -255,13 +255,17 @@ def execute(self, statement, parameters = ()):
 		c = ps.chunks(*pxf(parameters))
 		if ps._output is not None and len(ps._output) > 0:
 			# name, relationId, columnNumber, typeId, typlen, typmod, format
+			self.rowcount = -1
 			self.description = tuple([
 				(self.database.typio.decode(x[0]), dbapi_type(x[3]),
 				None, None, None, None, None)
 				for x in ps._output
 			])
 			self.__portals.insert(0, Portal(c))
 		else:
+			self.rowcount = c.count()
+			if self.rowcount is None:
+				self.rowcount = -1
 			self.description = None
 			# execute bumps any current portal
 			if self.__portals:
@@ -272,9 +276,10 @@ def executemany(self, statement, parameters):
 		sql, pxf, nparams = self._convert_query(statement)
 		ps = self.database.prepare(sql)
 		if ps._input is not None:
-			ps.load(map(pxf, parameters))
+			ps.load_rows(map(pxf, parameters))
 		else:
-			ps.load(parameters)
+			ps.load_rows(parameters)
+		self.rowcount = -1
 		return self
 
 	def close(self):
 
@@ -271,24 +271,33 @@ def test_rowcount(self):
 		try:
 			cur = con.cursor()
 			self.executeDDL1(cur)
-			self.assertEqual(cur.rowcount,-1,
+			self.assertEqual(cur.rowcount, -1,
 				'cursor.rowcount should be -1 after executing no-result '
 				'statements'
 			)
 			cur.execute("insert into %sbooze values ('Victoria Bitter')" % (
 				self.table_prefix
 			))
-			self.failUnless(cur.rowcount in (-1,1),
+			self.failUnlessEqual(cur.rowcount, 1,
 				'cursor.rowcount should == number or rows inserted, or '
 				'set to -1 after executing an insert statement'
 			)
+			cur.execute("insert into %sbooze select 'Victoria Bitter' WHERE FALSE" % (
+				self.table_prefix
+			))
+			self.failUnlessEqual(cur.rowcount, 0)
+			cur.execute("insert into %sbooze select 'First' UNION ALL select 'second'" % (
+				self.table_prefix
+			))
+			self.failUnlessEqual(cur.rowcount, 2)
+
 			cur.execute("select name from %sbooze" % self.table_prefix)
-			self.failUnless(cur.rowcount in (-1,1),
+			self.failUnlessEqual(cur.rowcount, -1,
 				'cursor.rowcount should == number of rows returned, or '
 				'set to -1 after executing a select statement'
 			)
 			self.executeDDL2(cur)
-			self.assertEqual(cur.rowcount,-1,
+			self.assertEqual(cur.rowcount, -1,
 				'cursor.rowcount not being reset to -1 after executing '
 				'no-result statements'
 			)