mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Handle missing conversation in SQL migration 41

Browse source
This commit is contained in:
Evan Hahn 2021-09-10 11:19:45 -05:00 • committed by GitHub
parent 6efb6da937
commit fbedda194c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ts/sql/Server.ts
View file

@ -2113,15 +2113,17 @@ function updateToSchemaVersion41(currentVersion: number, db: Database) {
return; return;
} }
const getConversationUuid = db.prepare<Query>( const getConversationUuid = db
` .prepare<Query>(
SELECT uuid `
FROM SELECT uuid
conversations FROM
WHERE conversations
id = $conversationId WHERE
` id = $conversationId
); `
)
.pluck();
const clearSessionsAndKeys = () => { const clearSessionsAndKeys = () => {
// ts/background.ts will ask user to relink so all that matters here is // ts/background.ts will ask user to relink so all that matters here is
@ -2250,7 +2252,7 @@ function updateToSchemaVersion41(currentVersion: number, db: Database) {
let deleted = 0; let deleted = 0;
for (const { id, senderId } of senderKeys) { for (const { id, senderId } of senderKeys) {
const [conversationId] = Helpers.unencodeNumber(senderId); const [conversationId] = Helpers.unencodeNumber(senderId);
const { uuid } = getConversationUuid.get({ conversationId }); const uuid = getConversationUuid.get({ conversationId });
if (!uuid) { if (!uuid) {
deleted += 1; deleted += 1;
@ -2311,7 +2313,7 @@ function updateToSchemaVersion41(currentVersion: number, db: Database) {
let updated = 0; let updated = 0;
let deleted = 0; let deleted = 0;
for (const { id, conversationId } of allSessions) { for (const { id, conversationId } of allSessions) {
const { uuid } = getConversationUuid.get({ conversationId }); const uuid = getConversationUuid.get({ conversationId });
if (!uuid) { if (!uuid) {
deleted += 1; deleted += 1;
deleteSession.run({ id }); deleteSession.run({ id });
@ -2359,7 +2361,7 @@ function updateToSchemaVersion41(currentVersion: number, db: Database) {
let migrated = 0; let migrated = 0;
for (const { id } of identityKeys) { for (const { id } of identityKeys) {
const { uuid } = getConversationUuid.get({ conversationId: id }); const uuid = getConversationUuid.get({ conversationId: id });
let newId: string; let newId: string;
if (uuid) { if (uuid) {