diff -r 8af7c6d86efb -r a964c40adbe3 server/sqlutils.py --- a/server/sqlutils.py Tue Jul 10 10:33:19 2012 +0200 +++ b/server/sqlutils.py Tue Jul 10 15:07:52 2012 +0200 @@ -214,31 +214,11 @@ # callback lookup for each *cell* in results when there is nothing to # lookup if not column_callbacks: - return self._process_result(cursor) + return self.dbhelper.dbapi_module.process_cursor(cursor, self._dbencoding, + Binary) assert session return self._cb_process_result(cursor, column_callbacks, session) - def _process_result(self, cursor): - # begin bind to locals for optimization - descr = cursor.description - encoding = self._dbencoding - process_value = self._process_value - binary = Binary - # /end - cursor.arraysize = 100 - while True: - results = cursor.fetchmany() - if not results: - break - for line in results: - result = [] - for col, value in enumerate(line): - if value is None: - result.append(value) - continue - result.append(process_value(value, descr[col], encoding, binary)) - yield result - def _cb_process_result(self, cursor, column_callbacks, session): # begin bind to locals for optimization descr = cursor.description