python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Warning propagation improvements

Browse Source
This commit is contained in:
Vilnis Termanis
2016-07-26 18:43:35 +01:00
parent 8c219d9261
commit ad935e4ba8
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MySQLdb/cursors.py
View File

@ -73,8 +73,7 @@ class BaseCursor(object):
self.messages = []
self.errorhandler = connection.errorhandler
self._result = None
self._warnings = 0
self._info = None
self._warnings = None
self.rownumber = None
def close(self):
@ -128,29 +127,37 @@ class BaseCursor(object):
def _warning_check(self):
from warnings import warn
db = self._get_db()
# None => warnings not interrogated for current query yet
# 0 => no warnings exists or have been handled already for this query
if self._warnings is None:
self._warnings = db.warning_count()
if self._warnings:
# Only propagate warnings for current query once
warning_count = self._warnings
self._warnings = 0
# When there is next result, fetching warnings cause "command
# out of sync" error.
if self._result and self._result.has_next:
msg = "There are %d MySQL warnings." % (self._warnings,)
msg = "There are %d MySQL warnings." % (warning_count,)
self.messages.append(msg)
warn(msg, self.Warning, 3)
warn(self.Warning(0, msg), stacklevel=3)
return
warnings = self._get_db().show_warnings()
warnings = db.show_warnings()
if warnings:
# This is done in two loops in case
# Warnings are set to raise exceptions.
for w in warnings:
self.messages.append((self.Warning, w))
for w in warnings:
msg = w[-1]
if not PY2 and isinstance(msg, bytes):
msg = msg.decode()
warn(msg, self.Warning, 3)
elif self._info:
self.messages.append((self.Warning, self._info))
warn(self._info, self.Warning, 3)
warn(self.Warning(*w[1:3]), stacklevel=3)
else:
info = db.info()
if info:
self.messages.append((self.Warning, info))
warn(self.Warning(0, info), stacklevel=3)
def nextset(self):
"""Advance to the next result set.
@ -180,8 +187,7 @@ class BaseCursor(object):
self.description = self._result and self._result.describe() or None
self.description_flags = self._result and self._result.field_flags() or None
self.lastrowid = db.insert_id()
self._warnings = db.warning_count()
self._info = db.info()
self._warnings = None
def setinputsizes(self, *args):
"""Does nothing, required by DB API."""