Keep row number in exception

Author: ods

aiochsa/exc.py

@@ -1,3 +1,4 @@
+from collections import namedtuple
 import re
 
 
@@ -10,7 +11,7 @@
     re.M,
 )
 
-at_row_re = re.compile(r'[(]at row (?P<row>\d+)[)]')
+at_row_re = re.compile(r'[(]at row (?P<num>\d+)[)]')
 
 class AiochsaException(Exception):
     """ Base class for aiochsa exceptions """
@@ -20,6 +21,9 @@ class ProtocolError(AiochsaException):
     """ Error communicating to Clickhouse server """
 
 
+RowInfo = namedtuple('RowInfo', ['num', 'content'])
+
+
 class DBException(AiochsaException):
     """ Error returned from Clickhouse database """
 
@@ -41,7 +45,7 @@ def __str__(self):
                 statement = statement[:200] + '...'
             message += f'\n{statement}'
         if self.row:
-            message += f'\n{self.row}'
+            message += f'\n{self.row.num}: {self.row.content}'
         return message
 
     @classmethod
@@ -55,9 +59,9 @@ def from_message(cls, exc_message, *, statement=None, rows=None):
                 at_row_m = at_row_re.search(display_text)
                 if at_row_m:
                     # It's 1-based
-                    row_num = int(at_row_m.group('row'))
+                    row_num = int(at_row_m.group('num'))
                     if len(rows) >= row_num:
-                        row = rows[row_num - 1]
+                        row = RowInfo(row_num, rows[row_num - 1])
 
             return cls(
                 code=int(m.group('code')),

tests/test_exc.py

@@ -44,4 +44,4 @@ async def test_exc_row(conn, table_test1):
             {'amount': Decimal('1234567890.1234567890')},
         )
     assert exc_info.value.code == error_codes.ARGUMENT_OUT_OF_BOUND
-    assert exc_info.value.row == '{"amount": 1234567890.1234567890}'
+    assert exc_info.value.row == (1, '{"amount": 1234567890.1234567890}')