Merge pull request PyMySQL#100 from methane/mysql-affected-rows-error

methane · web-flow · commit 8c219d9261ac · 2016-07-25T12:25:02.000+09:00
mysql_affected_rows may return -1
diff --git a/_mysql.c b/_mysql.c
@@ -823,9 +823,13 @@ _mysql_ConnectionObject_affected_rows(
 	_mysql_ConnectionObject *self,
 	PyObject *args)
 {
+	my_ulonglong ret;
 	if (!PyArg_ParseTuple(args, "")) return NULL;
 	check_connection(self);
-	return PyLong_FromUnsignedLongLong(mysql_affected_rows(&(self->connection)));
+	ret = mysql_affected_rows(&(self->connection));
+	if (ret == (my_ulonglong)-1)
+		return PyInt_FromLong(-1);
+	return PyLong_FromUnsignedLongLong(ret);
 }
 
 static char _mysql_debug__doc__[] =

Original file line number	Diff line number	Diff line change
`@@ -823,9 +823,13 @@ _mysql_ConnectionObject_affected_rows(`
`823`	`823`	`_mysql_ConnectionObject *self,`
`824`	`824`	`PyObject *args)`
`825`	`825`	`{`
	`826`	`+ my_ulonglong ret;`
`826`	`827`	`if (!PyArg_ParseTuple(args, "")) return NULL;`
`827`	`828`	`check_connection(self);`
`828`		`- return PyLong_FromUnsignedLongLong(mysql_affected_rows(&(self->connection)));`
	`829`	`+ ret = mysql_affected_rows(&(self->connection));`
	`830`	`+ if (ret == (my_ulonglong)-1)`
	`831`	`+ return PyInt_FromLong(-1);`
	`832`	`+ return PyLong_FromUnsignedLongLong(ret);`
`829`	`833`	`}`
`830`	`834`
`831`	`835`	`static char _mysql_debug__doc__[] =`