Reorder migrations

This commit is contained in:
Fedor Indutny 2023-01-30 11:55:38 -08:00 committed by GitHub
parent b78235e109
commit 270804d62d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 5 deletions

View file

@ -0,0 +1,25 @@
// Copyright 2023 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import type { Database } from '@signalapp/better-sqlite3';
import type { LoggerType } from '../../types/Logging';
export default function updateToSchemaVersion75(
currentVersion: number,
db: Database,
logger: LoggerType
): void {
if (currentVersion >= 75) {
return;
}
db.transaction(() => {
// This was previously a FTS5 migration, but we had to reorder the
// migrations for backports.
// See: migrations 76 and 77.
db.pragma('user_version = 75');
})();
logger.info('updateToSchemaVersion75: success!');
}

View file

@ -5,12 +5,12 @@ import type { Database } from '@signalapp/better-sqlite3';
import type { LoggerType } from '../../types/Logging'; import type { LoggerType } from '../../types/Logging';
export default function updateToSchemaVersion75( export default function updateToSchemaVersion77(
currentVersion: number, currentVersion: number,
db: Database, db: Database,
logger: LoggerType logger: LoggerType
): void { ): void {
if (currentVersion >= 75) { if (currentVersion >= 77) {
return; return;
} }
@ -37,8 +37,8 @@ export default function updateToSchemaVersion75(
` `
); );
db.pragma('user_version = 75'); db.pragma('user_version = 77');
})(); })();
logger.info('updateToSchemaVersion75: success!'); logger.info('updateToSchemaVersion77: success!');
} }

View file

@ -50,8 +50,9 @@ import updateToSchemaVersion71 from './71-merge-notifications';
import updateToSchemaVersion72 from './72-optimize-call-id-message-lookup'; import updateToSchemaVersion72 from './72-optimize-call-id-message-lookup';
import updateToSchemaVersion73 from './73-remove-phone-number-discovery'; import updateToSchemaVersion73 from './73-remove-phone-number-discovery';
import updateToSchemaVersion74 from './74-optimize-convo-open'; import updateToSchemaVersion74 from './74-optimize-convo-open';
import updateToSchemaVersion75 from './75-signal-tokenizer'; import updateToSchemaVersion75 from './75-noop';
import updateToSchemaVersion76 from './76-optimize-convo-open-2'; import updateToSchemaVersion76 from './76-optimize-convo-open-2';
import updateToSchemaVersion77 from './77-signal-tokenizer';
function updateToSchemaVersion1( function updateToSchemaVersion1(
currentVersion: number, currentVersion: number,
@ -1973,6 +1974,7 @@ export const SCHEMA_VERSIONS = [
updateToSchemaVersion74, updateToSchemaVersion74,
updateToSchemaVersion75, updateToSchemaVersion75,
updateToSchemaVersion76, updateToSchemaVersion76,
updateToSchemaVersion77,
]; ];
export function updateSchema(db: Database, logger: LoggerType): void { export function updateSchema(db: Database, logger: LoggerType): void {