openstack/deb-python-pymysql
Code Issues Proposed changes

fix protocol out of sync when error happens while load local infile.

Browse Source
This commit is contained in:
INADA Naoki
2016-01-04 06:16:31 +09:00
parent 344b933385
commit 0eba140466
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pymysql/connections.py
View File

@@ -1327,7 +1327,11 @@ class MySQLResult(object):
def _read_load_local_packet(self, first_packet): def _read_load_local_packet(self, first_packet):
load_packet = LoadLocalPacketWrapper(first_packet) load_packet = LoadLocalPacketWrapper(first_packet)
sender = LoadLocalFile(load_packet.filename, self.connection) sender = LoadLocalFile(load_packet.filename, self.connection)
sender.send_data() try:
sender.send_data()
except:
self.connection._read_packet() # skip ok packet
raise
ok_packet = self.connection._read_packet() ok_packet = self.connection._read_packet()
if not ok_packet.is_ok_packet(): # pragma: no cover - upstream induced protocol error if not ok_packet.is_ok_packet(): # pragma: no cover - upstream induced protocol error
@@ -1448,7 +1452,7 @@ class LoadLocalFile(object):
try: try:
with open(self.filename, 'rb') as open_file: with open(self.filename, 'rb') as open_file:
chunk_size = self.connection.max_allowed_packet chunk_size = conn.max_allowed_packet
packet = b"" packet = b""
while True: while True:

1
pymysql/tests/test_load_local.py
View File

@@ -61,6 +61,7 @@ class TestLoadLocal(base.PyMySQLTestCase):
self.assertTrue("Incorrect integer value" in str(w[-1].message)) self.assertTrue("Incorrect integer value" in str(w[-1].message))
finally: finally:
c.execute("DROP TABLE test_load_local") c.execute("DROP TABLE test_load_local")
c.close()
if __name__ == "__main__": if __name__ == "__main__":