minor refactoring, added possibility to compare the remote file and downloaded file (--file-read), prepping for #223

This commit is contained in:
Bernardo Damele
2012-12-18 17:49:18 +00:00
parent 9a1eca20b5
commit 8d9aa2c384
4 changed files with 54 additions and 36 deletions

View File

@@ -343,7 +343,7 @@ class Filesystem(GenericFilesystem):
self._stackedWriteFileVbs(tmpPath, wFileContent, dFile, fileType)
sameFile = self.askCheckWrittenFile(wFile, dFile, fileType)
sameFile = self.askCheckWrittenFile(wFile, dFile)
if sameFile is False:
message = "do you want to try to upload the file with "
@@ -353,3 +353,4 @@ class Filesystem(GenericFilesystem):
if not choice or choice.lower() == "y":
self._stackedWriteFileDebugExe(tmpPath, wFile, wFileContent, dFile, fileType)
#self._stackedWriteFilePS(tmpPath, wFileContent, dFile, fileType)
self.askCheckWrittenFile(wFile, dFile)

View File

@@ -100,7 +100,7 @@ class Filesystem(GenericFilesystem):
sqlQuery = "%s INTO DUMPFILE '%s'" % (fcEncodedStr, dFile)
unionUse(sqlQuery, unpack=False)
self.askCheckWrittenFile(wFile, dFile, fileType)
self.askCheckWrittenFile(wFile, dFile)
warnMsg = "expect junk characters inside the "
warnMsg += "file as a leftover from UNION query"
@@ -133,4 +133,4 @@ class Filesystem(GenericFilesystem):
# Reference: http://dev.mysql.com/doc/refman/5.1/en/select.html
inject.goStacked("SELECT %s FROM %s INTO DUMPFILE '%s'" % (self.tblField, self.fileTblName, dFile), silent=True)
self.askCheckWrittenFile(wFile, dFile, fileType)
self.askCheckWrittenFile(wFile, dFile)

View File

@@ -110,6 +110,6 @@ class Filesystem(GenericFilesystem):
# (pg_largeobject 'data' field)
inject.goStacked("SELECT lo_export(%d, '%s')" % (self.oid, dFile), silent=True)
self.askCheckWrittenFile(wFile, dFile, fileType)
self.askCheckWrittenFile(wFile, dFile)
inject.goStacked("SELECT lo_unlink(%d)" % self.oid)