Merge tag 'upstream/3.1.0'

Upstream version 3.1.0

# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 26 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/log.cpp b/SQLiteStudio3/coreSQLiteStudio/log.cpp
index d54abdb..d45f1aa 100644
--- a/SQLiteStudio3/coreSQLiteStudio/log.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/log.cpp
@@ -1,9 +1,11 @@
 #include "log.h"
+#include "db/queryexecutorsteps/queryexecutorstep.h"
 #include <QTime>
 #include <QDebug>
 
-bool SQL_DEBUG = false;
-QString SQL_DEBUG_FILTER = "";
+static bool SQL_DEBUG = false;
+static bool EXECUTOR_DEBUG = false;
+static QString SQL_DEBUG_FILTER = "";
 
 void setSqlLoggingEnabled(bool enabled)
 {
@@ -45,3 +47,25 @@ void logSql(Db* db, const QString& str, const QList<QVariant>& args, Db::Flags f
     foreach (const QVariant& arg, args)
         qDebug() << "    SQL arg>" << i++ << "=" << arg;
 }
+
+void setExecutorLoggingEnabled(bool enabled)
+{
+    EXECUTOR_DEBUG = enabled;
+}
+
+void logExecutorStep(QueryExecutorStep* step)
+{
+    if (!EXECUTOR_DEBUG)
+        return;
+
+    qDebug() << "Executing step:" << step->metaObject()->className() << step->objectName();
+}
+
+
+void logExecutorAfterStep(const QString& str)
+{
+    if (!EXECUTOR_DEBUG)
+        return;
+
+    qDebug() << str;
+}