execute() returns rows affected by operation if the lastrowid is not set.

Author: gnat

databases/backends/mysql.py

@@ -131,7 +131,9 @@ async def execute(self, query: ClauseElement) -> typing.Any:
         cursor = await self._connection.cursor()
         try:
             await cursor.execute(query, args)
-            return cursor.rowcount
+            if cursor.lastrowid == 0:
+                return cursor.rowcount
+            return cursor.lastrowid
         finally:
             await cursor.close()
 

databases/backends/sqlite.py

@@ -111,10 +111,14 @@ async def fetch_one(self, query: ClauseElement) -> typing.Optional[typing.Mappin
     async def execute(self, query: ClauseElement) -> typing.Any:
         assert self._connection is not None, "Connection is not acquired"
         query, args, context = self._compile(query)
-        cursor = await self._connection.execute(query, args)
-        rowcount = cursor.rowcount
-        await cursor.close()
-        return rowcount
+        cursor = await self._connection.cursor()
+        try:
+            await cursor.execute(query, args)
+            if cursor.lastrowid == 0:
+                return cursor.rowcount
+            return cursor.lastrowid
+        finally:
+            await cursor.close()
 
     async def execute_many(self, queries: typing.List[ClauseElement]) -> None:
         assert self._connection is not None, "Connection is not acquired"