From 8e640722c62692818ab840d50b3758f89a41a54e Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 25 Nov 2015 16:48:41 -0500 Subject: Imported Upstream version 3.0.7 --- SQLiteStudio3/coreSQLiteStudio/common/utils_sql.cpp | 13 +++++++++++++ SQLiteStudio3/coreSQLiteStudio/common/utils_sql.h | 2 ++ 2 files changed, 15 insertions(+) (limited to 'SQLiteStudio3/coreSQLiteStudio/common') 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 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 getQuoteCharacter(QString& obj, Dialect dialect, API_EXPORT QList wrapObjNames(const QList& objList, Dialect dialect = Dialect::Sqlite3, NameWrapper favWrapper = NameWrapper::null); API_EXPORT QList wrapObjNamesIfNeeded(const QList& objList, Dialect dialect, NameWrapper favWrapper = NameWrapper::null); API_EXPORT QList 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); -- cgit v1.2.3