From 194b5e438be67a3c084c3f26112d3c58987ae047 Mon Sep 17 00:00:00 2001 From: silverqx Date: Mon, 21 Nov 2022 18:02:13 +0100 Subject: [PATCH] used QLatin1String() for some operators --- src/orm/query/grammars/postgresgrammar.cpp | 6 +++--- src/orm/query/grammars/sqlitegrammar.cpp | 2 +- src/orm/query/querybuilder.cpp | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/orm/query/grammars/postgresgrammar.cpp b/src/orm/query/grammars/postgresgrammar.cpp index 5151ed636..3b4198f02 100644 --- a/src/orm/query/grammars/postgresgrammar.cpp +++ b/src/orm/query/grammars/postgresgrammar.cpp @@ -85,10 +85,10 @@ const QVector &PostgresGrammar::getOperators() const { static const QVector cachedOperators { EQ, LT, GT, LE, GE, NE, NE_, - LIKE, NLIKE, "between", ILIKE, "not ilike", + LIKE, NLIKE, QLatin1String("between"), ILIKE, QLatin1String("not ilike"), "~", B_AND, B_OR, "#", "<<", ">>", "<<=", ">>=", - AND_, "@>", "<@", "?", "?|", "?&", OR_, "-", "@?", "@@", "#-", - "is distinct from", "is not distinct from", + AND_, "@>", "<@", "?", "?|", "?&", OR_, MINUS, "@?", "@@", "#-", + QLatin1String("is distinct from"), QLatin1String("is not distinct from"), }; return cachedOperators; diff --git a/src/orm/query/grammars/sqlitegrammar.cpp b/src/orm/query/grammars/sqlitegrammar.cpp index 1426eebb6..c17f07c53 100644 --- a/src/orm/query/grammars/sqlitegrammar.cpp +++ b/src/orm/query/grammars/sqlitegrammar.cpp @@ -77,7 +77,7 @@ const QVector &SQLiteGrammar::getOperators() const static const QVector cachedOperators { EQ, LT, GT, LE, GE, NE_, NE, LIKE, NLIKE, ILIKE, - B_AND, B_OR, "<<", ">>", + B_AND, B_OR, QLatin1String("<<"), QLatin1String(">>"), }; return cachedOperators; diff --git a/src/orm/query/querybuilder.cpp b/src/orm/query/querybuilder.cpp index 29fa14086..89d22c4be 100644 --- a/src/orm/query/querybuilder.cpp +++ b/src/orm/query/querybuilder.cpp @@ -1735,12 +1735,13 @@ void Builder::checkBindingType(const BindingType type) const const QVector &Builder::getOperators() { static const QVector cachedOperators { - EQ, LT, GT, LE, GE, NE_, NE, "<=>", - LIKE, "like binary", NLIKE, ILIKE, + EQ, LT, GT, LE, GE, NE_, NE, QLatin1String("<=>"), + LIKE, QLatin1String("like binary"), NLIKE, ILIKE, B_AND, B_OR, "^", "<<", ">>", "&~", - "rlike", "not rlike", "regexp", "not regexp", - "~", "~*", "!~", "!~*", "similar to", - "not similar to", "not ilike", "~~*", "!~~*", + QLatin1String("rlike"), QLatin1String("not rlike"), + QLatin1String("regexp"), QLatin1String("not regexp"), + "~", "~*", "!~", "!~*", QLatin1String("similar to"), + QLatin1String("not similar to"), QLatin1String("not ilike"), "~~*", "!~~*", }; return cachedOperators;