Imported Upstream version 3.1.0upstream/3.1.0

13 files changed, 83 insertions, 41 deletions

diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp
index 0ac506f..94ee80e 100644
--- a/SQLiteStudio3/sqlitestudio/main.cpp
+++ b/SQLiteStudio3/sqlitestudio/main.cpp
@@ -36,7 +36,7 @@
 #include <QMessageBox>

 #include <QProcess>

 

-bool listPlugins = false;

+static bool listPlugins = false;

 

 QString uiHandleCmdLineArgs()

 {

@@ -51,6 +51,7 @@ QString uiHandleCmdLineArgs()
     QCommandLineOption lemonDebugOption("debug-lemon", QObject::tr("Enables Lemon parser debug messages for SQL code assistant."));

     QCommandLineOption sqlDebugOption("debug-sql", QObject::tr("Enables debugging of every single SQL query being sent to any database."));

     QCommandLineOption sqlDebugDbNameOption("debug-sql-db", QObject::tr("Limits SQL query messages to only the given <database>."), QObject::tr("database"));

+    QCommandLineOption executorDebugOption("debug-query-executor", QObject::tr("Enables debugging of SQLiteStudio's query executor."));

     QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio and quits."));

     parser.addOption(debugOption);

     parser.addOption(debugStdOutOption);

@@ -58,6 +59,7 @@ QString uiHandleCmdLineArgs()
     parser.addOption(lemonDebugOption);

     parser.addOption(sqlDebugOption);

     parser.addOption(sqlDebugDbNameOption);

+    parser.addOption(executorDebugOption);

     parser.addOption(listPluginsOption);

 

     parser.addPositionalArgument(QObject::tr("file"), QObject::tr("Database file to open"));

@@ -68,6 +70,7 @@ QString uiHandleCmdLineArgs()
     setUiDebug(enableDebug, !parser.isSet(debugStdOutOption), parser.value(debugFileOption));

     CompletionHelper::enableLemonDebug = parser.isSet(lemonDebugOption);

     setSqlLoggingEnabled(parser.isSet(sqlDebugOption));

+    setExecutorLoggingEnabled(parser.isSet(executorDebugOption));

     if (parser.isSet(sqlDebugDbNameOption))

         setSqlLoggingFilter(parser.value(sqlDebugDbNameOption));

 

diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.qm
index 9dad8df..6007538 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.qm
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.qm
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts
index ce4a973..ff1c85b 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>QObject</name>
     <message>
@@ -11,17 +11,17 @@
     <message>
         <location filename="../main.cpp" line="48"/>
         <source>Enables debug messages in console (accessible with F12).</source>
-        <translation>Aktiviert Debug-Meldungen in der Konsole (erreichbar über F12)</translation>
+        <translation>Aktiviert Debug-Meldungen in der Konsole (erreichbar über F12).</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="49"/>
         <source>Redirects debug messages into standard output (forces debug mode).</source>
-        <translation>Leitet Debug-Meldungen in den Standardausgabekanal um (erzwingt den Debugmodus)</translation>
+        <translation>Leitet Debug-Meldungen in den Standardausgabekanal um (erzwingt den Debugmodus).</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="50"/>
         <source>Redirects debug messages into given file (forces debug mode).</source>
-        <translation>Leitet Debug-Meldungen in die angegebene Datei um (erzwingt den Debugmodus)</translation>
+        <translation>Leitet Debug-Meldungen in die angegebene Datei um (erzwingt den Debugmodus).</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="50"/>
@@ -51,23 +51,28 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translatorcomment>Was wird hier beendet?</translatorcomment>
         <translation>Listet die in SQLiteStudio installierten Plugins auf und beendet.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation>Zu öffnende Datenbankdatei</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts
index 443941d..0130240 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts
index f801dd7..78be06b 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_fr.ts
@@ -32,7 +32,7 @@
     <message>
         <location filename="../main.cpp" line="51"/>
         <source>Enables Lemon parser debug messages for SQL code assistant.</source>
-        <translation>Message de déboguage avec l&apos;analyseur Lemon pour un assistant code SQL.</translation>
+        <translation>Message de déboguage avec l&rsquo;analyseur Lemon pour un assistant code SQL.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="52"/>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.qm
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts
index f0caedd..9cd5c61 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="it_IT">
+<TS version="2.0" language="it_IT">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts
index 967434a..700bb5e 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>QObject</name>
     <message>
@@ -55,5 +55,9 @@
         <source>log file</source>
         <translation>plik logów</translation>
     </message>
+    <message>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation>Włącza debugowanie wykonawcy zapytań w SQLiteStudio.</translation>
+    </message>
 </context>
 </TS>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts
index 2a54175..b637de7 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts
index 3ca5a22..9808fe7 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation>Выводит список установленных в SQLiteStudio модулей и осуществляет выход.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation>файл</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation>Файл базы данных для открытия</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts
index a7b3257..496f44d 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation>Súbor</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.qm
index be651ee..83692c1 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.qm
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.qm
diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts
index ec8bd90..d5b76d7 100644
--- a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts
+++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>QObject</name>
     <message>
@@ -50,22 +50,27 @@
     </message>
     <message>
         <location filename="../main.cpp" line="54"/>
+        <source>Enables debugging of SQLiteStudio&apos;s query executor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="55"/>
         <source>Lists plugins installed in the SQLiteStudio and quits.</source>
         <translation>列出已安装的插件并退出。</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>file</source>
         <translation>文件</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="63"/>
+        <location filename="../main.cpp" line="65"/>
         <source>Database file to open</source>
         <translation>要打开的数据库文件</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="86"/>
-        <location filename="../main.cpp" line="102"/>
+        <location filename="../main.cpp" line="89"/>
+        <location filename="../main.cpp" line="105"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>