Skip to content

Commit

Permalink
Restored missing completer entries: string, number, BLOB literal.
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelsalawa committed Dec 27, 2024
1 parent 3f5588e commit 50bd388
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions SQLiteStudio3/coreSQLiteStudio/completionhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ QList<ExpectedTokenPtr> 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"));
Expand All @@ -275,7 +275,7 @@ QList<ExpectedTokenPtr> 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);
Expand Down
2 changes: 1 addition & 1 deletion SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

DEFINE_SINGLETON(SQLiteStudio)

static const int sqlitestudioVersion = 30412;
static const int sqlitestudioVersion = 30413;

SQLiteStudio::SQLiteStudio()
{
Expand Down
4 changes: 2 additions & 2 deletions SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 50bd388

Please sign in to comment.