Imported Upstream version 3.0.4upstream/3.0.4

12 files changed, 70 insertions, 58 deletions

diff --git a/Plugins/SqlExport/SqlExport_de.ts b/Plugins/SqlExport/SqlExport_de.ts
index 9346fcd..5313de2 100644
--- a/Plugins/SqlExport/SqlExport_de.ts
+++ b/Plugins/SqlExport/SqlExport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_es.ts b/Plugins/SqlExport/SqlExport_es.ts
index 87c95b0..2ff1ffa 100644
--- a/Plugins/SqlExport/SqlExport_es.ts
+++ b/Plugins/SqlExport/SqlExport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_fr.ts b/Plugins/SqlExport/SqlExport_fr.ts
index 7ffe713..02c2cbc 100644
--- a/Plugins/SqlExport/SqlExport_fr.ts
+++ b/Plugins/SqlExport/SqlExport_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation>-- Table: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation>-- Indéxe: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation>-- Déclencheur: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation>-- Vue: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation>-- Fichier généré par SQLiteStudio v%1sur %2</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation>-- Encodage texte utilisé: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation>Nom de table pour la déclaration INSERT est obligatoire.</translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_pl.ts b/Plugins/SqlExport/SqlExport_pl.ts
index 5fc187b..7c8a3f5 100644
--- a/Plugins/SqlExport/SqlExport_pl.ts
+++ b/Plugins/SqlExport/SqlExport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation>-- Tabela: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation>-- Indeks: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation>-- Wyzwalacz: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation>-- Widok: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation>-- Plik wygenerowany przez SQLiteStudio v%1 dnia %2</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation>-- Użyte kodowanie tekstu: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation>Nazwa tabeli dla zapytania INSERT jest obowiązkowa.</translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_pt_BR.ts b/Plugins/SqlExport/SqlExport_pt_BR.ts
index 803c9dc..a781f3a 100644
--- a/Plugins/SqlExport/SqlExport_pt_BR.ts
+++ b/Plugins/SqlExport/SqlExport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_ru.ts b/Plugins/SqlExport/SqlExport_ru.ts
index 9b03eaf..b6b1cd8 100644
--- a/Plugins/SqlExport/SqlExport_ru.ts
+++ b/Plugins/SqlExport/SqlExport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation>-- Таблица: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation>-- Индекс: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation>-- Триггер: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation>-- Представление: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation>-- Файл сгенерирован с помощью SQLiteStudio v%1 в %2</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation>-- Использованная кодировка текста: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation>Имя таблицы для конструкций INSERT обязательно.</translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_sk.ts b/Plugins/SqlExport/SqlExport_sk.ts
index 6494355..ef6a4bc 100644
--- a/Plugins/SqlExport/SqlExport_sk.ts
+++ b/Plugins/SqlExport/SqlExport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_zh_CN.ts b/Plugins/SqlExport/SqlExport_zh_CN.ts
index 1d81d3f..d29cae8 100644
--- a/Plugins/SqlExport/SqlExport_zh_CN.ts
+++ b/Plugins/SqlExport/SqlExport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>SqlExport</name>
     <message>
@@ -14,32 +14,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="167"/>
+        <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="184"/>
+        <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="201"/>
+        <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="215"/>
+        <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="219"/>
+        <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="303"/>
+        <location filename="sqlexport.cpp" line="312"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/sqlexport.cpp b/Plugins/SqlExport/sqlexport.cpp
index 0a379b1..15e47ed 100644
--- a/Plugins/SqlExport/sqlexport.cpp
+++ b/Plugins/SqlExport/sqlexport.cpp
@@ -145,6 +145,7 @@ bool SqlExport::exportTableRow(SqlResultsRowPtr data)
 bool SqlExport::afterExport()
 {
     writeCommit();
+    writeFkEnable();
     return true;
 }
 
@@ -237,12 +238,20 @@ void SqlExport::writeFkDisable()
     writeln("PRAGMA foreign_keys = off;");
 }
 
+void SqlExport::writeFkEnable()
+{
+    writeln("PRAGMA foreign_keys = on;");
+}
+
 QString SqlExport::formatQuery(const QString& sql)
 {
     if (cfg.SqlExport.UseFormatter.get())
         return FORMATTER->format("sql", sql, db);
 
-    return sql;
+    if (sql.trimmed().endsWith(";"))
+        return sql;
+
+    return sql.trimmed() + ";";
 }
 
 QString SqlExport::getNameForObject(const QString& database, const QString& name, bool wrapped, Dialect dialect)
diff --git a/Plugins/SqlExport/sqlexport.h b/Plugins/SqlExport/sqlexport.h
index 9e23418..56eb42d 100644
--- a/Plugins/SqlExport/sqlexport.h
+++ b/Plugins/SqlExport/sqlexport.h
@@ -53,6 +53,7 @@ class SQLEXPORTSHARED_EXPORT SqlExport : public GenericExportPlugin
         void writeBegin();
         void writeCommit();
         void writeFkDisable();
+        void writeFkEnable();
         QString formatQuery(const QString& sql);
         QString getNameForObject(const QString& database, const QString& name, bool wrapped, Dialect dialect = Dialect::Sqlite3);
         QStringList rowToArgList(SqlResultsRowPtr row);
diff --git a/Plugins/SqlExport/sqlexport.json b/Plugins/SqlExport/sqlexport.json
index bd06adf..82ad923 100644
--- a/Plugins/SqlExport/sqlexport.json
+++ b/Plugins/SqlExport/sqlexport.json
@@ -2,6 +2,6 @@
     "type":        "ExportPlugin",
     "title":       "SQL export",
     "description": "Provides SQL format for exporting",
-    "version":     10100,
+    "version":     10101,
     "author":      "SalSoft"
 }
diff --git a/Plugins/SqlExport/sqlexport.qrc b/Plugins/SqlExport/sqlexport.qrc
index ca38e9c..ed5da11 100644
--- a/Plugins/SqlExport/sqlexport.qrc
+++ b/Plugins/SqlExport/sqlexport.qrc
@@ -7,5 +7,7 @@
         <file>SqlExport_pl.qm</file>
         <file>SqlExport_ru.qm</file>
         <file>SqlExport_fr.qm</file>
+        <file>SqlExport_sk.qm</file>
+        <file>SqlExport_zh_CN.qm</file>
     </qresource>
 </RCC>