File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
Filter options
Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
Original file line number Diff line number Diff line change @@ -129,13 +129,16 @@ def char_array(s):
129
129
def array2Str (o , d ):
130
130
return Thing2Literal (o .tostring (), d )
131
131
132
+ def quote_tuple (t , d ):
133
+ return "(%s)" % (',' .join (escape_sequence (t , d )))
134
+
132
135
conversions = {
133
136
IntType : Thing2Str ,
134
137
LongType : Long2Int ,
135
138
FloatType : Float2Str ,
136
139
NoneType : None2NULL ,
137
- TupleType : escape_sequence ,
138
- ListType : escape_sequence ,
140
+ TupleType : quote_tuple ,
141
+ ListType : quote_tuple ,
139
142
DictType : escape_dict ,
140
143
InstanceType : Instance2Str ,
141
144
ArrayType : array2Str ,
Original file line number Diff line number Diff line change @@ -180,7 +180,10 @@ def execute(self, query, args=None):
180
180
if isinstance (query , unicode ):
181
181
query = query .encode (db .unicode_literal .charset )
182
182
if args is not None :
183
- query = query % db .literal (args )
183
+ if isinstance (args , dict ):
184
+ query = query % {key : db .literal (item ) for key , item in args .iteritems ()}
185
+ else :
186
+ query = query % tuple ([db .literal (item ) for item in args ])
184
187
try :
185
188
r = None
186
189
r = self ._query (query )
You can’t perform that action at this time.
0 commit comments