Add queries_count property to Protocol

Author: 1st1

asyncpg/protocol/protocol.pxd

@@ -34,6 +34,8 @@ cdef class BaseProtocol(CoreProtocol):
         int uid_counter
         bint closing
 
+        readonly uint64_t queries_count
+
         PreparedStatementState statement
 
     cdef _ensure_clear_state(self)

asyncpg/protocol/protocol.pyx

@@ -95,6 +95,8 @@ cdef class BaseProtocol(CoreProtocol):
         self.timeout_callback = self._on_timeout
         self.completed_callback = self._on_waiter_completed
 
+        self.queries_count = 0
+
         try:
             self.create_future = loop.create_future
         except AttributeError:
@@ -140,6 +142,7 @@ cdef class BaseProtocol(CoreProtocol):
         self.last_query = state.query
         self.statement = state
         self.return_extra = return_extra
+        self.queries_count += 1
 
         return await self._new_waiter(timeout)
 
@@ -177,6 +180,7 @@ cdef class BaseProtocol(CoreProtocol):
         self.last_query = state.query
         self.statement = state
         self.return_extra = return_extra
+        self.queries_count += 1
 
         return await self._new_waiter(timeout)
 
@@ -188,6 +192,7 @@ cdef class BaseProtocol(CoreProtocol):
 
         self._simple_query(query)
         self.last_query = query
+        self.queries_count += 1
 
         return await self._new_waiter(timeout)
 

tests/test_execute.py

@@ -7,13 +7,15 @@
 class TestExecuteScript(tb.ConnectedTestCase):
 
     async def test_execute_script_1(self):
+        self.assertEqual(self.con._protocol.queries_count, 0)
         status = await self.con.execute('''
             SELECT 1;
 
             SELECT true FROM pg_type WHERE false = true;
 
             SELECT generate_series(0, 9);
         ''')
+        self.assertEqual(self.con._protocol.queries_count, 1)
         self.assertEqual(status, 'SELECT 10')
 
     async def test_execute_script_check_transactionality(self):

tests/test_prepare.py

@@ -8,14 +8,18 @@
 class TestPrepare(tb.ConnectedTestCase):
 
     async def test_prepare_01(self):
+        self.assertEqual(self.con._protocol.queries_count, 0)
         st = await self.con.prepare('SELECT 1 = $1 AS test')
+        self.assertEqual(self.con._protocol.queries_count, 0)
         self.assertEqual(st.get_query(), 'SELECT 1 = $1 AS test')
 
         rec = await st.fetchrow(1)
+        self.assertEqual(self.con._protocol.queries_count, 1)
         self.assertTrue(rec['test'])
         self.assertEqual(len(rec), 1)
 
         self.assertEqual(False, await st.fetchval(10))
+        self.assertEqual(self.con._protocol.queries_count, 2)
 
     async def test_prepare_02(self):
         with self.assertRaisesRegex(Exception, 'column "a" does not exist'):