Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 9 insertions, 3 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/log.cpp b/SQLiteStudio3/coreSQLiteStudio/log.cpp
index d45f1aa..60a22b2 100644
--- a/SQLiteStudio3/coreSQLiteStudio/log.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/log.cpp
@@ -1,6 +1,7 @@
 #include "log.h"
 #include "db/queryexecutorsteps/queryexecutorstep.h"
 #include <QTime>
+#include <QDateTime>
 #include <QDebug>
 
 static bool SQL_DEBUG = false;
@@ -17,6 +18,11 @@ void setSqlLoggingFilter(const QString& filter)
     SQL_DEBUG_FILTER = filter;
 }
 
+QString getLogDateTime()
+{
+    return QDateTime::currentDateTime().toString("[HH:mm:ss.zzz]");
+}
+
 void logSql(Db* db, const QString& str, const QHash<QString,QVariant>& args, Db::Flags flags)
 {
     if (!SQL_DEBUG)
@@ -44,7 +50,7 @@ void logSql(Db* db, const QString& str, const QList<QVariant>& args, Db::Flags f
 
     qDebug() << QString("SQL %1> %2").arg(db->getName()).arg(str) << "(flags:" << Db::flagsToString(flags) << ")";
     int i = 0;
-    foreach (const QVariant& arg, args)
+    for (const QVariant& arg : args)
         qDebug() << "    SQL arg>" << i++ << "=" << arg;
 }
 
@@ -58,7 +64,7 @@ void logExecutorStep(QueryExecutorStep* step)
     if (!EXECUTOR_DEBUG)
         return;
 
-    qDebug() << "Executing step:" << step->metaObject()->className() << step->objectName();
+    qDebug() << getLogDateTime() << "Executing step:" << step->metaObject()->className() << step->objectName();
 }
 
 
@@ -67,5 +73,5 @@ void logExecutorAfterStep(const QString& str)
     if (!EXECUTOR_DEBUG)
         return;
 
-    qDebug() << str;
+    qDebug() << getLogDateTime() << str;
 }