diff --git a/lib/core/convert.py b/lib/core/convert.py index d7c49cbf1..805484d8a 100644 --- a/lib/core/convert.py +++ b/lib/core/convert.py @@ -177,7 +177,7 @@ def safechardecode(value): else: break - elif isinstance(value, list): + elif isinstance(value, (list, tuple)): for i in xrange(len(value)): retVal[i] = safechardecode(value[i]) diff --git a/lib/core/dump.py b/lib/core/dump.py index f96534fff..52eef4ba7 100644 --- a/lib/core/dump.py +++ b/lib/core/dump.py @@ -358,6 +358,9 @@ class Dump: if not conf.multipleTargets and not conf.replicate: dataToDumpFile(dumpFP, "\n") + if conf.replicate: + rtable.beginTransaction() + for i in range(count): field = 1 values = [] @@ -398,11 +401,12 @@ class Dump: self.__write("%s\n" % separator) if conf.replicate: + rtable.endTransaction() logger.info("Table '%s.%s' dumped to sqlite3 file '%s'" % (db, table, replication.dbpath)) + elif not conf.multipleTargets: dataToDumpFile(dumpFP, "\n") dumpFP.close() - logger.info("Table '%s.%s' dumped to CSV file '%s'" % (db, table, dumpFileName)) def dbColumns(self, dbColumns, colConsider, dbs): diff --git a/lib/core/replication.py b/lib/core/replication.py index 68f59ca0e..61c88d518 100644 --- a/lib/core/replication.py +++ b/lib/core/replication.py @@ -71,6 +71,16 @@ class Replication: errMsg = "wrong number of columns used in replicating insert" raise sqlmapValueException, errMsg + def beginTransaction(self): + """ + Great speed improvement can be gained by using explicit transactions around multiple inserts. + Reference: http://stackoverflow.com/questions/4719836/python-and-sqlite3-adding-thousands-of-rows + """ + self.parent.cursor.execute('BEGIN TRANSACTION') + + def endTransaction(self): + self.parent.cursor.execute('END TRANSACTION') + def select(self, condition=None): """ This function is used for selecting row(s) from current table.