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

Fix runtime error during SQL migration

Browse source
This commit is contained in:
Fedor Indutny 2021-10-27 10:15:03 -07:00 • committed by GitHub
parent 30078ce3aa
commit 246583d274
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/sql/migrations/43-gv2-uuid.ts
View file

@ -5,7 +5,6 @@ import type { Database } from 'better-sqlite3';
import { omit } from 'lodash';
import type { LoggerType } from '../../types/Logging';
import { UUID } from '../../types/UUID';
import type { UUIDStringType } from '../../types/UUID';
import { isNotNil } from '../../util/isNotNil';
import { assert } from '../../util/assert';
@ -265,11 +264,11 @@ export default function updateToSchemaVersion43(
}
changedDetails = true;
let newValue: UUIDStringType | null = getConversationUuid.get({
const newValue: UUIDStringType | null = getConversationUuid.get({
conversationId: oldValue,
});
if (key === 'inviter') {
newValue = newValue ?? UUID.cast(oldValue);
if (key === 'inviter' && !newValue) {
continue;
}
if (!newValue) {
logger.warn(
@ -302,12 +301,11 @@ export default function updateToSchemaVersion43(
}
if (sourceUuid) {
const newValue: UUIDStringType =
getConversationUuid.get({
conversationId: sourceUuid,
}) ?? UUID.cast(sourceUuid);
const newValue: UUIDStringType | null = getConversationUuid.get({
conversationId: sourceUuid,
});
if (newValue !== sourceUuid) {
if (newValue) {
result = {
...result,
sourceUuid: newValue,