Change where debug output

Author: nakagami

firebirdsql/aio/fbcore.py

@@ -66,11 +66,7 @@ class AsyncStatement(Statement):
     def __init__(self, trans):
         DEBUG_OUTPUT("AsyncStatement::__init__()")
         self.trans = trans
-        self._allocate_stmt()
-        self._is_open = False
-        self.stmt_type = None
 
-    def _allocate_stmt(self):
         self.trans.connection._op_allocate_statement()
         if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
             self.trans.connection.lazy_response_count += 1
@@ -79,6 +75,9 @@ def _allocate_stmt(self):
             (h, oid, buf) = self.trans.connection._op_response()
             self.handle = h
 
+        self._is_open = False
+        self.stmt_type = None
+
     def fetch_generator(self):
         # TODO: async method ?
         return super().fetch_generator()
@@ -141,6 +140,7 @@ async def __init__(self, cur, sql, explain_plan=False):
         self.sql = sql
 
     async def close(self):
+        DEBUG_OUTPUT("PreparedStatement::close()")
         await self.stmt.close()
 
 
@@ -186,14 +186,13 @@ async def _get_stmt(self, query):
         return stmt
 
     async def prep(self, query, explain_plan=False):
-        DEBUG_OUTPUT("Cursor::prep()")
+        DEBUG_OUTPUT("AcyncCursor::prep()")
         prepared_statement = await AsyncPreparedStatement(self, query, explain_plan=explain_plan)
         return prepared_statement
 
     async def _execute(self, query, params):
         if params is None:
             params = []
-        DEBUG_OUTPUT("Cursor::execute()", query, params)
         await self.transaction.check_trans_handle()
         stmt = await self._get_stmt(query)
         cooked_params = self._convert_params(params)
@@ -222,6 +221,7 @@ async def _execute(self, query, params):
         return self
 
     async def execute(self, query, params=None):
+        DEBUG_OUTPUT("AsyncCursor::execute()", query, params)
         try:
             return await self._execute(query, params)
         finally:
@@ -230,7 +230,7 @@ async def execute(self, query, params=None):
     async def callproc(self, procname, params=None):
         if params is None:
             params = []
-        DEBUG_OUTPUT("Cursor::callproc()")
+        DEBUG_OUTPUT("AsyncCursor::callproc()")
         query = 'EXECUTE PROCEDURE ' + procname + ' ' + ','.join('?'*len(params))
         await self.execute(query, params)
         return self._callproc_result
@@ -338,7 +338,7 @@ def description(self):
 
     @property
     async def rowcount(self):
-        DEBUG_OUTPUT("Cursor::rowcount()")
+        DEBUG_OUTPUT("AsyncCursor::rowcount()")
         if self.stmt.handle == -1:
             return -1
 
@@ -352,7 +352,7 @@ async def rowcount(self):
         else:
             # insert count + update count + delete count
             count = bytes_to_int(buf[27:31]) + bytes_to_int(buf[6:10]) + bytes_to_int(buf[13:17])
-        DEBUG_OUTPUT("Cursor::rowcount()", self.stmt.stmt_type, count)
+        DEBUG_OUTPUT("AsyncCursor::rowcount()", self.stmt.stmt_type, count)
         return count
 
 
@@ -380,6 +380,7 @@ async def begin(self):
         await self._begin()
 
     async def savepoint(self, name):
+        DEBUG_OUTPUT("AsyncTransaction::savepoint()", name)
         if self._trans_handle is None:
             return
         self.connection._op_exec_immediate(self._trans_handle, query='SAVEPOINT '+name)
@@ -811,6 +812,7 @@ async def commit(self, retaining=False):
             await self._transaction.commit(retaining=retaining)
 
     async def savepoint(self, name):
+        DEBUG_OUTPUT("AsyncConnection::savepoint()", name)
         return await self._transaction.savepoint(name)
 
     async def rollback(self, retaining=False, savepoint=None):

firebirdsql/fbcore.py

@@ -60,11 +60,7 @@ class Statement(object):
     def __init__(self, trans):
         DEBUG_OUTPUT("Statement::__init__()")
         self.trans = trans
-        self._allocate_stmt()
-        self._is_open = False
-        self.stmt_type = None
 
-    def _allocate_stmt(self):
         self.trans.connection._op_allocate_statement()
         if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
             self.trans.connection.lazy_response_count += 1
@@ -73,6 +69,9 @@ def _allocate_stmt(self):
             (h, oid, buf) = self.trans.connection._op_response()
             self.handle = h
 
+        self._is_open = False
+        self.stmt_type = None
+
     def fetch_generator(self):
         DEBUG_OUTPUT("Statement::_fetch_generator()", self.handle, self.trans._trans_handle)
         connection = self.trans.connection
@@ -195,6 +194,7 @@ def __getattr__(self, attrname):
         raise AttributeError
 
     def close(self):
+        DEBUG_OUTPUT("PreparedStatement::close()")
         self.stmt.close()
 
 
@@ -255,7 +255,6 @@ def prep(self, query, explain_plan=False):
     def _execute(self, query, params):
         if params is None:
             params = []
-        DEBUG_OUTPUT("Cursor::execute()", query, params)
         self.transaction.check_trans_handle()
         stmt = self._get_stmt(query)
         cooked_params = self._convert_params(params)
@@ -268,9 +267,6 @@ def _execute(self, query, params):
             self.transaction.connection._op_response()
             self._fetch_records = None
         else:
-            DEBUG_OUTPUT(
-                "Cursor::execute() _op_execute()",
-                stmt.handle, self.transaction.trans_handle)
             self.transaction.connection._op_execute(
                 stmt.handle, self.transaction.trans_handle, cooked_params)
             (h, oid, buf) = self.transaction.connection._op_response()
@@ -284,6 +280,7 @@ def _execute(self, query, params):
         return self
 
     def execute(self, query, params=None):
+        DEBUG_OUTPUT("Cursor::execute()", query, params)
         try:
             return self._execute(query, params)
         finally:
@@ -471,6 +468,7 @@ def begin(self):
         self._begin()
 
     def savepoint(self, name):
+        DEBUG_OUTPUT("Transaction::savepoint()", name)
         if self._trans_handle is None:
             return
         self.connection._op_exec_immediate(self._trans_handle, query='SAVEPOINT '+name)
@@ -911,6 +909,7 @@ def commit(self, retaining=False):
             self._transaction.commit(retaining=retaining)
 
     def savepoint(self, name):
+        DEBUG_OUTPUT("Connection::savepoint()", name)
         return self._transaction.savepoint(name)
 
     def rollback(self, retaining=False, savepoint=None):