Merge pull request pymssql#281 from pymssql/pr280

Fix some cases of cursor.rowcont having a -1 value after iterating over .fetch*()

Refs pymssql#141

Author: ramiro

pymssql.pyx

@@ -507,8 +507,8 @@ cdef class Cursor:
 
         try:
             return self.getrow()
-
         except StopIteration:
+            self._rownumber = self._source._conn.rows_affected
             return None
         except _mssql.MSSQLDatabaseException, e:
             raise OperationalError, e.args[0]
@@ -529,6 +529,7 @@ cdef class Cursor:
                 try:
                     rows.append(self.getrow())
                 except StopIteration:
+                    self._rownumber = self._source._conn.rows_affected
                     break
             return rows
         except _mssql.MSSQLDatabaseException, e:

tests/helpers.py

@@ -287,6 +287,24 @@ def test_select_rowcount(self):
         cur.fetchall()
         eq_(cur.rowcount, 5)
 
+    def test_fetchone_rowcount(self):
+        cur = self.execute('select * from test')
+        eq_(cur.rowcount, -1)
+
+        for _ in iter(cur.fetchone, None):
+            eq_(cur.rowcount, -1)
+
+        eq_(cur.rowcount, 5)
+
+    def test_fetchmany_rowcount(self):
+        cur = self.execute('select * from test')
+        eq_(cur.rowcount, -1)
+
+        for _ in iter(cur.fetchmany, []):
+            eq_(cur.rowcount, -1)
+
+        eq_(cur.rowcount, 5)
+
     def test_as_dict(self):
         # test for http://code.google.com/p/pymssql/issues/detail?id=92
         cur = self.conn.cursor(as_dict=True)