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, 1 insertions, 37 deletions

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()