diff --git a/ChangeLog.md b/ChangeLog.md index 69b5dfa5ce..9696d2942e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ # ChangeLog +### 3.4.13 +- BUGFIX: Restored missing completer entries: string, number, BLOB literal. + ### 3.4.12 - BIGFIX: #5179 Fixed results returned from query joining the same table twice. - BIGFIX: #5179 Fixed smart execution when joining tables with USING clause, so the result metadata is extracted properly and results can be edited. diff --git a/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp b/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp index c42c2e851d..65221c0259 100644 --- a/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp @@ -257,7 +257,7 @@ QList CompletionHelper::getExpectedTokens(TokenPtr token) results += getExpectedToken(ExpectedToken::OTHER, QString(), QString(), tr("Any word")); break; case Token::STRING: - results += getExpectedToken(ExpectedToken::STRING, QString(), QString(), tr("String")); + results += getExpectedToken(ExpectedToken::STRING, "''", QString(), tr("String")); break; case Token::FLOAT: results += getExpectedToken(ExpectedToken::NUMBER, QString(), QString(), tr("Number")); @@ -275,7 +275,7 @@ QList CompletionHelper::getExpectedTokens(TokenPtr token) results += getExpectedToken(ExpectedToken::OPERATOR, ")"); break; case Token::BLOB: - results += getExpectedToken(ExpectedToken::BLOB, QString(), QString(), tr("BLOB literal")); + results += getExpectedToken(ExpectedToken::BLOB, "X''", QString(), tr("BLOB literal")); break; case Token::KEYWORD: results += getExpectedToken(ExpectedToken::KEYWORD, token->value); diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp index 3b708ec660..94daad3a1a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp @@ -42,7 +42,7 @@ DEFINE_SINGLETON(SQLiteStudio) -static const int sqlitestudioVersion = 30412; +static const int sqlitestudioVersion = 30413; SQLiteStudio::SQLiteStudio() { diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp index 68ca58daa1..fb5dac93ca 100644 --- a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp @@ -236,9 +236,9 @@ QString CompleterWindow::getStatusMsg(const QModelIndex& index) case ExpectedToken::OPERATOR: return tr("Operator: %1", "completer statusbar").arg(value); case ExpectedToken::STRING: - return tr("String", "completer statusbar"); + return tr("String", "completer statusbar").arg(value); case ExpectedToken::NUMBER: - return tr("Number", "completer statusbar").arg(value); + return tr("Number", "completer statusbar"); case ExpectedToken::BLOB: return tr("Binary data", "completer statusbar").arg(value); case ExpectedToken::COLLATION: