Minor adjustment and bug fix

bdamele · bdamele · commit fdf417f57eb6 · 2010-03-10T22:08:11.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1072,9 +1072,9 @@ def __setVerbosity():
 
     if conf.verbose == 1:
         logger.setLevel(logging.INFO)
-    elif conf.verbose > 1 and conf.eta:
-        conf.verbose = 1
-        logger.setLevel(logging.INFO)
+    elif conf.verbose > 2 and conf.eta:
+        conf.verbose = 2
+        logger.setLevel(logging.DEBUG)
     elif conf.verbose == 2:
         logger.setLevel(logging.DEBUG)
     elif conf.verbose == 3:
diff --git a/lib/utils/resume.py b/lib/utils/resume.py
@@ -64,7 +64,10 @@ def queryOutputLength(expression, payload):
         return None, None, None
 
     if selectDistinctExpr:
-        lengthExpr = "SELECT %s FROM (%s) AS T%s" % (lengthQuery % regExpr, expression, randomStr(4))
+        lengthExpr = "SELECT %s FROM (%s)" % (lengthQuery % regExpr, expression)
+
+        if kb.dbms in ( "MySQL", "PostgreSQL" ):
+            lengthExpr += " AS %s" % randomStr(lowercase=True)
     elif select:
         lengthExpr = expression.replace(regExpr, lengthQuery % regExpr, 1)
     else:
