Imported Upstream version 3.0.7upstream/3.0.7

2 files changed, 15 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp
index 3ace551..eba10fa 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp
@@ -159,6 +159,19 @@ QList<NameWrapper> getAllNameWrappers(Dialect dialect)
         return {NameWrapper::DOUBLE_QUOTE, NameWrapper::BRACKET, NameWrapper::QUOTE};
 }
 
+QString wrapValueIfNeeded(const QString& str)
+{
+    return wrapValueIfNeeded(QVariant::fromValue(str));
+}
+
+QString wrapValueIfNeeded(const QVariant& value)
+{
+    if (value.canConvert(QMetaType::LongLong) || value.canConvert(QMetaType::Double))
+        return value.toString();
+
+    return wrapString(value.toString());
+}
+
 QString wrapString(const QString& str)
 {
     QString result = str;
diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h
index 945b7cc..038c146 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h
+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h
@@ -56,6 +56,8 @@ API_EXPORT QPair<QChar,QChar> getQuoteCharacter(QString& obj, Dialect dialect,
 API_EXPORT QList<QString> wrapObjNames(const QList<QString>& objList, Dialect dialect = Dialect::Sqlite3, NameWrapper favWrapper = NameWrapper::null);
 API_EXPORT QList<QString> wrapObjNamesIfNeeded(const QList<QString>& objList, Dialect dialect, NameWrapper favWrapper = NameWrapper::null);
 API_EXPORT QList<NameWrapper> getAllNameWrappers(Dialect dialect = Dialect::Sqlite3);
+API_EXPORT QString wrapValueIfNeeded(const QString& str);
+API_EXPORT QString wrapValueIfNeeded(const QVariant& value);
 API_EXPORT int qHash(NameWrapper wrapper);
 API_EXPORT QString getPrefixDb(const QString& origDbName, Dialect dialect);
 API_EXPORT bool isSystemTable(const QString& name);