Minor bug fix so that --file-write on MySQL via UNION query now works again

This commit is contained in:
Bernardo Damele 2011-02-11 23:35:45 +00:00
parent 535eb9f3eb
commit 7253362114
2 changed files with 3 additions and 8 deletions

View File

@ -434,13 +434,8 @@ class Agent:
@rtype: C{str}
"""
if unpack:
concatenatedQuery = ""
query = query.replace(", ", ",")
fieldsSelectFrom, fieldsSelect, fieldsNoSelect, fieldsSelectTop, fieldsSelectCase, _, fieldsToCastStr, fieldsExists = self.getFields(query)
castedFields = self.nullCastConcatFields(fieldsToCastStr)
concatenatedQuery = query.replace(fieldsToCastStr, castedFields, 1)
if not unpack:
return query
else:
concatenatedQuery = query
fieldsSelectFrom, fieldsSelect, fieldsNoSelect, fieldsSelectTop, fieldsSelectCase, _, fieldsToCastStr, fieldsExists = self.getFields(query)

View File

@ -89,7 +89,7 @@ class Filesystem(GenericFilesystem):
logger.debug(debugMsg)
sqlQuery = "%s INTO DUMPFILE '%s'" % (fcEncodedStr, dFile)
unionUse(sqlQuery)
unionUse(sqlQuery, unpack=False)
if confirm:
self.askCheckWrittenFile(wFile, dFile, fileType)