Imported Upstream version 3.1.0upstream/3.1.0

13 files changed, 20 insertions, 56 deletions

diff --git a/Plugins/SqlExport/SqlExport_de.ts b/Plugins/SqlExport/SqlExport_de.ts
index 5313de2..e61f506 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.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <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 2ff1ffa..a3d552a 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.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_fr.qm b/Plugins/SqlExport/SqlExport_fr.qm
index 6258242..5be0b78 100644
--- a/Plugins/SqlExport/SqlExport_fr.qm
+++ b/Plugins/SqlExport/SqlExport_fr.qm
diff --git a/Plugins/SqlExport/SqlExport_fr.ts b/Plugins/SqlExport/SqlExport_fr.ts
index 02c2cbc..279dd99 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.1" language="fr_FR">
+<TS version="2.0" language="fr_FR">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation>-- Encodage texte utilisé: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation>Nom de table pour la déclaration INSERT est obligatoire.</translation>
     </message>
@@ -77,7 +77,7 @@
     <message>
         <location filename="SqlExportQuery.ui" line="37"/>
         <source>Generate &quot;CREATE TABLE&quot; statement at the begining</source>
-        <translation>Genre la déclaration   &quot;CREATE TABLE&quot; au debut</translation>
+        <translation>Genre la déclaration &quot;CREATE TABLE&quot; au debut</translation>
     </message>
     <message>
         <location filename="SqlExportQuery.ui" line="47"/>
diff --git a/Plugins/SqlExport/SqlExport_it.qm b/Plugins/SqlExport/SqlExport_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/SqlExport/SqlExport_it.qm
diff --git a/Plugins/SqlExport/SqlExport_it.ts b/Plugins/SqlExport/SqlExport_it.ts
index 7f5368b..d53b3a2 100644
--- a/Plugins/SqlExport/SqlExport_it.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_pl.ts b/Plugins/SqlExport/SqlExport_pl.ts
index 7c8a3f5..5eafc0b 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.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation>-- Użyte kodowanie tekstu: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <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 a781f3a..ec49ef0 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.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <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 b6b1cd8..20f808d 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.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation>-- Использованная кодировка текста: %1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <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 ef6a4bc..a10648c 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.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <source>Table name for INSERT statements is mandatory.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/SqlExport/SqlExport_zh_CN.qm b/Plugins/SqlExport/SqlExport_zh_CN.qm
index be651ee..2a6959c 100644
--- a/Plugins/SqlExport/SqlExport_zh_CN.qm
+++ b/Plugins/SqlExport/SqlExport_zh_CN.qm
diff --git a/Plugins/SqlExport/SqlExport_zh_CN.ts b/Plugins/SqlExport/SqlExport_zh_CN.ts
index c6c72de..2b62da0 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.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>SqlExport</name>
     <message>
@@ -39,7 +39,7 @@
         <translation>-- 文本编码：%1</translation>
     </message>
     <message>
-        <location filename="sqlexport.cpp" line="312"/>
+        <location filename="sqlexport.cpp" line="276"/>
         <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 15e47ed..0ae91ff 100644
--- a/Plugins/SqlExport/sqlexport.cpp
+++ b/Plugins/SqlExport/sqlexport.cpp
@@ -265,43 +265,7 @@ QString SqlExport::getNameForObject(const QString& database, const QString& name
 
 QStringList SqlExport::rowToArgList(SqlResultsRowPtr row)
 {
-    QStringList argList;
-    for (const QVariant& value : row->valueList())
-    {
-        if (!value.isValid() || value.isNull())
-        {
-            argList << "NULL";
-            continue;
-        }
-
-        switch (value.userType())
-        {
-            case QVariant::Int:
-            case QVariant::UInt:
-            case QVariant::LongLong:
-            case QVariant::ULongLong:
-                argList << value.toString();
-                break;
-            case QVariant::Double:
-                argList << QString::number(value.toDouble());
-                break;
-            case QVariant::Bool:
-                argList << QString::number(value.toInt());
-                break;
-            case QVariant::ByteArray:
-            {
-                if (db->getVersion() >= 3) // version 2 will go to the regular string processing
-                {
-                    argList << "X'" + value.toByteArray().toHex().toUpper() + "'";
-                    break;
-                }
-            }
-            default:
-                argList << wrapString(escapeString(value.toString()));
-                break;
-        }
-    }
-    return argList;
+    return valueListToSqlList(row->valueList(), db->getDialect());
 }
 
 void SqlExport::validateOptions()