Fix #44 - Invalid affected_row count on multiple statements

Author: pcisar

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.9] - 2025-01-03
+
+### Fixed
+
+- Fix #44 - Invalid affected_row count on multiple statements
+
 ## [1.10.8] - 2024-12-23
 
 ### Fixed

docs/changelog.txt

@@ -2,6 +2,11 @@
 Changelog
 #########
 
+Version 1.10.9
+==============
+
+- Fix #44 - Invalid affected_row count on multiple statements
+
 Version 1.10.8
 ==============
 

src/firebird/driver/__init__.py

@@ -61,4 +61,4 @@
      Server, Statement)
 
 #: Current driver version, SEMVER string.
-__VERSION__ = '1.10.8'
+__VERSION__ = '1.10.9'

src/firebird/driver/core.py

@@ -4134,7 +4134,19 @@ def affected_rows(self) -> int:
         """
         if self._stmt is None:
             return -1
-        return sum(self._stmt.info.get_info(StmtInfoCode.RECORDS).values())
+        rows: Dict[ReqInfoCode, int] = self._stmt.info.get_info(StmtInfoCode.RECORDS)
+        code: ReqInfoCode = None
+        if self._stmt.type in (StatementType.SELECT, StatementType.SELECT_FOR_UPD):
+            code = ReqInfoCode.SELECT_COUNT
+        elif self._stmt.type == StatementType.UPDATE:
+            code = ReqInfoCode.UPDATE_COUNT
+        elif self._stmt.type == StatementType.INSERT:
+            code = ReqInfoCode.INSERT_COUNT
+        elif self._stmt.type == StatementType.DELETE:
+            code = ReqInfoCode.DELETE_COUNT
+        else:
+            return -1
+        return rows[code]
     rowcount = affected_rows
     @property
     def transaction(self) -> TransactionManager:

tests/test_driver.py

@@ -1043,6 +1043,17 @@ def test_affected_rows(self):
                 rcount = 1
             self.assertEqual(cur.affected_rows, rcount)
             self.assertEqual(cur.rowcount, rcount)
+    def test_affected_rows_with_multiple_execute_statements_and_different_command(self):
+        with self.con.cursor() as cur:
+            cur.execute("insert into project (proj_id, proj_name) values ('FOO', 'BAR')")
+            cur.execute("update project set proj_name = 'RAB' where proj_id = 'FOO'")
+            cur.fetchone()
+            if sys.platform == 'win32':
+                rcount = 6
+            else:
+                rcount = 1
+            self.assertEqual(cur.affected_rows, rcount)
+            self.assertEqual(cur.rowcount, rcount)
     def test_name(self):
         def assign_name():
             cur.set_cursor_name('testx')