mirror of
https://github.com/PyMySQL/mysqlclient.git
synced 2025-08-15 11:10:58 +08:00
Fix the conversion of list or tuple args to a SQL.
When there is one element on the list, the generated SQL was (1,) (python notation of a single element tuple, which is not valid in SQL.
This commit is contained in:
@ -129,13 +129,16 @@ def char_array(s):
|
||||
def array2Str(o, d):
|
||||
return Thing2Literal(o.tostring(), d)
|
||||
|
||||
def quote_tuple(t, d):
|
||||
return "(%s)" % (','.join(escape_sequence(t, d)))
|
||||
|
||||
conversions = {
|
||||
IntType: Thing2Str,
|
||||
LongType: Long2Int,
|
||||
FloatType: Float2Str,
|
||||
NoneType: None2NULL,
|
||||
TupleType: escape_sequence,
|
||||
ListType: escape_sequence,
|
||||
TupleType: quote_tuple,
|
||||
ListType: quote_tuple,
|
||||
DictType: escape_dict,
|
||||
InstanceType: Instance2Str,
|
||||
ArrayType: array2Str,
|
||||
|
@ -180,7 +180,10 @@ class BaseCursor(object):
|
||||
if isinstance(query, unicode):
|
||||
query = query.encode(db.unicode_literal.charset)
|
||||
if args is not None:
|
||||
query = query % db.literal(args)
|
||||
if isinstance(args, dict):
|
||||
query = query % {key: db.literal(item) for key, item in args.iteritems()}
|
||||
else:
|
||||
query = query % tuple([db.literal(item) for item in args])
|
||||
try:
|
||||
r = None
|
||||
r = self._query(query)
|
||||
|
Reference in New Issue
Block a user