openstack/deb-python-pymysql
Code Issues Proposed changes

Rename load_local flag to local_infile.

Browse Source
This commit is contained in:
Stacey Wrazien
2015-01-13 09:24:50 -05:00
parent afbb064501
commit 5eca5981a7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.databases.json
View File

@@ -1,5 +1,5 @@
[ [
{"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql", "use_unicode": true}, {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql", "use_unicode": true},
{"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql2" }, {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql2" },
{"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql", "load_local": true} {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql", "local_infile": true}
] ]

5
pymysql/connections.py
View File

@@ -497,7 +497,7 @@ class Connection(object):
client_flag=0, cursorclass=Cursor, init_command=None, client_flag=0, cursorclass=Cursor, init_command=None,
connect_timeout=None, ssl=None, read_default_group=None, connect_timeout=None, ssl=None, read_default_group=None,
compress=None, named_pipe=None, no_delay=False, compress=None, named_pipe=None, no_delay=False,
autocommit=False, db=None, passwd=None, load_local=False): autocommit=False, db=None, passwd=None, local_infile=False):
""" """
Establish a connection to the MySQL database. Accepts several Establish a connection to the MySQL database. Accepts several
arguments: arguments:
@@ -530,6 +530,7 @@ class Connection(object):
named_pipe: Not supported named_pipe: Not supported
no_delay: Disable Nagle's algorithm on the socket no_delay: Disable Nagle's algorithm on the socket
autocommit: Autocommit mode. None means use server default. (default: False) autocommit: Autocommit mode. None means use server default. (default: False)
local_infile: Boolean to enable the use of LOAD DATA LOCAL command. (default: False)
db: Alias for database. (for compatibility to MySQLdb) db: Alias for database. (for compatibility to MySQLdb)
passwd: Alias for password. (for compatibility to MySQLdb) passwd: Alias for password. (for compatibility to MySQLdb)
@@ -546,7 +547,7 @@ class Connection(object):
if compress or named_pipe: if compress or named_pipe:
raise NotImplementedError("compress and named_pipe arguments are not supported") raise NotImplementedError("compress and named_pipe arguments are not supported")
if load_local: if local_infile:
client_flag |= CLIENT.LOCAL_FILES client_flag |= CLIENT.LOCAL_FILES
self.local_file = None self.local_file = None