Skip to content
Snippets Groups Projects
Commit dbc486e4de85 authored by INADA Naoki's avatar INADA Naoki
Browse files

Merge pull request #291 from PyMySQL/fetchmany-emptytuple

Return empty tuple when no rows in result
No related branches found
No related tags found
No related merge requests found
......@@ -235,7 +235,7 @@
''' Fetch several rows '''
self._check_executed()
if self._rows is None:
return None
return ()
end = self.rownumber + (size or self.arraysize)
result = self._rows[self.rownumber:end]
self.rownumber = min(end, len(self._rows))
......@@ -245,7 +245,7 @@
''' Fetch all the rows '''
self._check_executed()
if self._rows is None:
return None
return ()
if self.rownumber:
result = self._rows[self.rownumber:]
else:
......@@ -396,7 +396,6 @@
Fetch all, as per MySQLdb. Pretty useless for large queries, as
it is buffered. See fetchall_unbuffered(), if you want an unbuffered
generator version of this method.
"""
return list(self.fetchall_unbuffered())
......@@ -413,7 +412,6 @@
def fetchmany(self, size=None):
""" Fetch many """
self._check_executed()
if size is None:
size = self.arraysize
......
......@@ -169,7 +169,6 @@
'If cleaning up is needed after nextSetTest'
cur.execute("drop procedure deleteme")
@unittest.expectedFailure
def test_nextset(self):
from warnings import warn
con = self._connect()
......
......@@ -26,4 +26,4 @@
print('---')
import pymysql.tests
unittest.main(pymysql.tests)
unittest.main(pymysql.tests, verbosity=2)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment