Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 97f603a

Browse files
committed
Fix for an Issue #641
1 parent 0622cdf commit 97f603a

2 files changed

Lines changed: 26 additions & 29 deletions

File tree

lib/core/agent.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,7 @@ def suffixQuery(self, expression, comment=None, suffix=None, where=None):
238238
pass
239239

240240
elif suffix and not comment:
241-
if suffix.startswith(GENERIC_SQL_COMMENT):
242-
expression += "%s" % suffix
243-
else:
244-
expression += " %s" % suffix
241+
expression += suffix
245242

246243
return re.sub(r"(?s);\W*;", ";", expression)
247244

xml/payloads.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Formats:
274274
<where>1,2</where>
275275
<ptype>1</ptype>
276276
<prefix>)</prefix>
277-
<suffix>AND ([RANDNUM]=[RANDNUM]</suffix>
277+
<suffix> AND ([RANDNUM]=[RANDNUM]</suffix>
278278
</boundary>
279279

280280
<boundary>
@@ -283,7 +283,7 @@ Formats:
283283
<where>1,2</where>
284284
<ptype>1</ptype>
285285
<prefix>))</prefix>
286-
<suffix>AND (([RANDNUM]=[RANDNUM]</suffix>
286+
<suffix> AND (([RANDNUM]=[RANDNUM]</suffix>
287287
</boundary>
288288

289289
<boundary>
@@ -292,7 +292,7 @@ Formats:
292292
<where>1,2</where>
293293
<ptype>1</ptype>
294294
<prefix>)))</prefix>
295-
<suffix>AND ((([RANDNUM]=[RANDNUM]</suffix>
295+
<suffix> AND ((([RANDNUM]=[RANDNUM]</suffix>
296296
</boundary>
297297

298298
<boundary>
@@ -310,7 +310,7 @@ Formats:
310310
<where>1,2</where>
311311
<ptype>2</ptype>
312312
<prefix>')</prefix>
313-
<suffix>AND ('[RANDSTR]'='[RANDSTR]</suffix>
313+
<suffix> AND ('[RANDSTR]'='[RANDSTR]</suffix>
314314
</boundary>
315315

316316
<boundary>
@@ -319,7 +319,7 @@ Formats:
319319
<where>1,2</where>
320320
<ptype>2</ptype>
321321
<prefix>'))</prefix>
322-
<suffix>AND (('[RANDSTR]'='[RANDSTR]</suffix>
322+
<suffix> AND (('[RANDSTR]'='[RANDSTR]</suffix>
323323
</boundary>
324324

325325
<boundary>
@@ -328,7 +328,7 @@ Formats:
328328
<where>1,2</where>
329329
<ptype>2</ptype>
330330
<prefix>')))</prefix>
331-
<suffix>AND ((('[RANDSTR]'='[RANDSTR]</suffix>
331+
<suffix> AND ((('[RANDSTR]'='[RANDSTR]</suffix>
332332
</boundary>
333333

334334
<boundary>
@@ -337,7 +337,7 @@ Formats:
337337
<where>1,2</where>
338338
<ptype>2</ptype>
339339
<prefix>'</prefix>
340-
<suffix>AND '[RANDSTR]'='[RANDSTR]</suffix>
340+
<suffix> AND '[RANDSTR]'='[RANDSTR]</suffix>
341341
</boundary>
342342

343343
<boundary>
@@ -346,7 +346,7 @@ Formats:
346346
<where>1,2</where>
347347
<ptype>3</ptype>
348348
<prefix>')</prefix>
349-
<suffix>AND ('[RANDSTR]' LIKE '[RANDSTR]</suffix>
349+
<suffix> AND ('[RANDSTR]' LIKE '[RANDSTR]</suffix>
350350
</boundary>
351351

352352
<boundary>
@@ -355,7 +355,7 @@ Formats:
355355
<where>1,2</where>
356356
<ptype>3</ptype>
357357
<prefix>'))</prefix>
358-
<suffix>AND (('[RANDSTR]' LIKE '[RANDSTR]</suffix>
358+
<suffix> AND (('[RANDSTR]' LIKE '[RANDSTR]</suffix>
359359
</boundary>
360360

361361
<boundary>
@@ -364,7 +364,7 @@ Formats:
364364
<where>1,2</where>
365365
<ptype>3</ptype>
366366
<prefix>')))</prefix>
367-
<suffix>AND ((('[RANDSTR]' LIKE '[RANDSTR]</suffix>
367+
<suffix> AND ((('[RANDSTR]' LIKE '[RANDSTR]</suffix>
368368
</boundary>
369369

370370
<boundary>
@@ -373,7 +373,7 @@ Formats:
373373
<where>1,2</where>
374374
<ptype>3</ptype>
375375
<prefix>'</prefix>
376-
<suffix>AND '[RANDSTR]' LIKE '[RANDSTR]</suffix>
376+
<suffix> AND '[RANDSTR]' LIKE '[RANDSTR]</suffix>
377377
</boundary>
378378

379379
<boundary>
@@ -382,7 +382,7 @@ Formats:
382382
<where>1,2</where>
383383
<ptype>4</ptype>
384384
<prefix>")</prefix>
385-
<suffix>AND ("[RANDSTR]"="[RANDSTR]</suffix>
385+
<suffix> AND ("[RANDSTR]"="[RANDSTR]</suffix>
386386
</boundary>
387387

388388
<boundary>
@@ -391,7 +391,7 @@ Formats:
391391
<where>1,2</where>
392392
<ptype>4</ptype>
393393
<prefix>"))</prefix>
394-
<suffix>AND (("[RANDSTR]"="[RANDSTR]</suffix>
394+
<suffix> AND (("[RANDSTR]"="[RANDSTR]</suffix>
395395
</boundary>
396396

397397
<boundary>
@@ -400,7 +400,7 @@ Formats:
400400
<where>1,2</where>
401401
<ptype>4</ptype>
402402
<prefix>")))</prefix>
403-
<suffix>AND ((("[RANDSTR]"="[RANDSTR]</suffix>
403+
<suffix> AND ((("[RANDSTR]"="[RANDSTR]</suffix>
404404
</boundary>
405405

406406
<boundary>
@@ -409,7 +409,7 @@ Formats:
409409
<where>1,2</where>
410410
<ptype>4</ptype>
411411
<prefix>"</prefix>
412-
<suffix>AND "[RANDSTR]"="[RANDSTR]</suffix>
412+
<suffix> AND "[RANDSTR]"="[RANDSTR]</suffix>
413413
</boundary>
414414

415415
<boundary>
@@ -418,7 +418,7 @@ Formats:
418418
<where>1,2</where>
419419
<ptype>5</ptype>
420420
<prefix>")</prefix>
421-
<suffix>AND ("[RANDSTR]" LIKE "[RANDSTR]</suffix>
421+
<suffix> AND ("[RANDSTR]" LIKE "[RANDSTR]</suffix>
422422
</boundary>
423423

424424
<boundary>
@@ -427,7 +427,7 @@ Formats:
427427
<where>1,2</where>
428428
<ptype>5</ptype>
429429
<prefix>"))</prefix>
430-
<suffix>AND (("[RANDSTR]" LIKE "[RANDSTR]</suffix>
430+
<suffix> AND (("[RANDSTR]" LIKE "[RANDSTR]</suffix>
431431
</boundary>
432432

433433
<boundary>
@@ -436,7 +436,7 @@ Formats:
436436
<where>1,2</where>
437437
<ptype>5</ptype>
438438
<prefix>")))</prefix>
439-
<suffix>AND ((("[RANDSTR]" LIKE "[RANDSTR]</suffix>
439+
<suffix> AND ((("[RANDSTR]" LIKE "[RANDSTR]</suffix>
440440
</boundary>
441441

442442
<boundary>
@@ -445,7 +445,7 @@ Formats:
445445
<where>1,2</where>
446446
<ptype>5</ptype>
447447
<prefix>"</prefix>
448-
<suffix>AND "[RANDSTR]" LIKE "[RANDSTR]</suffix>
448+
<suffix> AND "[RANDSTR]" LIKE "[RANDSTR]</suffix>
449449
</boundary>
450450

451451
<boundary>
@@ -454,7 +454,7 @@ Formats:
454454
<where>1,2</where>
455455
<ptype>2</ptype>
456456
<prefix>%')</prefix>
457-
<suffix>AND ('%'='</suffix>
457+
<suffix> AND ('%'='</suffix>
458458
</boundary>
459459

460460
<boundary>
@@ -463,7 +463,7 @@ Formats:
463463
<where>1,2</where>
464464
<ptype>2</ptype>
465465
<prefix>%'))</prefix>
466-
<suffix>AND (('%'='</suffix>
466+
<suffix> AND (('%'='</suffix>
467467
</boundary>
468468

469469
<boundary>
@@ -472,7 +472,7 @@ Formats:
472472
<where>1,2</where>
473473
<ptype>2</ptype>
474474
<prefix>%')))</prefix>
475-
<suffix>AND ((('%'='</suffix>
475+
<suffix> AND ((('%'='</suffix>
476476
</boundary>
477477

478478
<boundary>
@@ -481,7 +481,7 @@ Formats:
481481
<where>1,2</where>
482482
<ptype>2</ptype>
483483
<prefix>%'</prefix>
484-
<suffix>AND '%'='</suffix>
484+
<suffix> AND '%'='</suffix>
485485
</boundary>
486486

487487
<boundary>
@@ -490,7 +490,7 @@ Formats:
490490
<where>1,2</where>
491491
<ptype>2</ptype>
492492
<prefix>%00')</prefix>
493-
<suffix>AND ('[RANDSTR]'='[RANDSTR]</suffix>
493+
<suffix> AND ('[RANDSTR]'='[RANDSTR]</suffix>
494494
</boundary>
495495

496496
<boundary>
@@ -499,7 +499,7 @@ Formats:
499499
<where>1,2</where>
500500
<ptype>2</ptype>
501501
<prefix>%00'</prefix>
502-
<suffix>AND '[RANDSTR]'='[RANDSTR]</suffix>
502+
<suffix> AND '[RANDSTR]'='[RANDSTR]</suffix>
503503
</boundary>
504504

505505
<boundary>

0 commit comments

Comments
 (0)