VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-08-07 11:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for CONPY-67:

Browse Source 
If no rows were fetched from an unbuffered cursor (resultset) rowcount
now returns -1 instead of 0.
This commit is contained in:
Georg Richter
2020-05-27 10:40:35 +02:00
parent 01113686e4
commit e58caef84c
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mariadb_python.h
View File

@ -253,8 +253,7 @@ typedef struct {
enum enum_result_format result_format; enum enum_result_format result_format;
uint8_t is_prepared; uint8_t is_prepared;
uint8_t is_buffered; uint8_t is_buffered;
/* uint8_t is_named_tuple; uint8_t fetched;
uint8_t is_dictionary; */
uint8_t is_closed; uint8_t is_closed;
uint8_t is_text; uint8_t is_text;
MrdbParser *parser; MrdbParser *parser;

11
src/mariadb_cursor.c
View File

@ -429,6 +429,7 @@ void MrdbCursor_clear(MrdbCursor *self, uint8_t new_stmt)
} }
} }
self->fetched= 0;
if (self->is_text) if (self->is_text)
{ {
@ -902,6 +903,8 @@ static int MrdbCursor_fetchinternal(MrdbCursor *self)
int rc; int rc;
unsigned int i; unsigned int i;
self->fetched= 1;
if (!self->is_text) if (!self->is_text)
{ {
rc= mysql_stmt_fetch(self->stmt); rc= mysql_stmt_fetch(self->stmt);
@ -1418,7 +1421,13 @@ Mariadb_row_count(MrdbCursor *self)
if (self->field_count) if (self->field_count)
{ {
row_count= CURSOR_NUM_ROWS(self); if (!self->is_buffered && !self->fetched)
{
row_count= -1;
} else
{
row_count= CURSOR_NUM_ROWS(self);
}
} }
else { else {
row_count= self->row_count ? self->row_count : CURSOR_AFFECTED_ROWS(self); row_count= self->row_count ? self->row_count : CURSOR_AFFECTED_ROWS(self);

16
test/integration/test_cursor.py
View File

@ -141,13 +141,13 @@ class TestCursor(unittest.TestCase):
self.assertRaises(mariadb.Error, cursor.fetchall) self.assertRaises(mariadb.Error, cursor.fetchall)
cursor.execute("SELECT id, name, city FROM test_fetchmany ORDER BY id") cursor.execute("SELECT id, name, city FROM test_fetchmany ORDER BY id")
self.assertEqual(0, cursor.rowcount) self.assertEqual(-1, cursor.rowcount)
row = cursor.fetchall() row = cursor.fetchall()
self.assertEqual(row, params) self.assertEqual(row, params)
self.assertEqual(5, cursor.rowcount) self.assertEqual(5, cursor.rowcount)
cursor.execute("SELECT id, name, city FROM test_fetchmany ORDER BY id") cursor.execute("SELECT id, name, city FROM test_fetchmany ORDER BY id")
self.assertEqual(0, cursor.rowcount) self.assertEqual(-1, cursor.rowcount)
row = cursor.fetchmany(1) row = cursor.fetchmany(1)
self.assertEqual(row, [params[0]]) self.assertEqual(row, [params[0]])
@ -927,5 +927,17 @@ class TestCursor(unittest.TestCase):
row= cur.fetchone() row= cur.fetchone()
self.assertEqual(row[0], Decimal(1.25)) self.assertEqual(row[0], Decimal(1.25))
def test_conpy67(self):
con= create_connection()
cur = con.cursor()
cur.execute("SELECT 1")
self.assertEqual(cur.rowcount, -1)
del cur
cur = con.cursor()
cur.execute("SELECT 1 WHERE 1=2")
self.assertEqual(cur.rowcount, -1)
cur.fetchall()
self.assertEqual(cur.rowcount, 0)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()