From bfbeedab5ce1cdbff14f3709e5749bd912ed8aa6 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Mon, 2 Apr 2018 15:26:23 -0400
Subject: [PATCH] Temporarily disable post-attachment migration migrations
---
js/background.js | 28 +++++++++----------
js/database.js | 4 +--
...rations_0_database_with_attachment_data.js | 6 ++--
...ions_1_database_without_attachment_data.js | 16 +++++------
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/js/background.js b/js/background.js
index c8bb9171cec..5c72a636fae 100644
--- a/js/background.js
+++ b/js/background.js
@@ -19,7 +19,7 @@
const { upgradeMessageSchema } = window.Signal.Migrations;
const {
Migrations0DatabaseWithAttachmentData,
- Migrations1DatabaseWithoutAttachmentData,
+ // Migrations1DatabaseWithoutAttachmentData,
} = window.Signal.Migrations;
const { Views } = window.Signal;
@@ -86,20 +86,20 @@
console.log('Migrate database with attachments');
await Migrations0DatabaseWithAttachmentData.run({ Backbone });
- console.log('Migrate attachments to disk');
- const database = Migrations0DatabaseWithAttachmentData.getDatabase();
- await MessageDataMigrator.processAll({
- Backbone,
- databaseName: database.name,
- minDatabaseVersion: database.version,
- upgradeMessageSchema,
- });
+ // console.log('Migrate attachments to disk');
+ // const database = Migrations0DatabaseWithAttachmentData.getDatabase();
+ // await MessageDataMigrator.processAll({
+ // Backbone,
+ // databaseName: database.name,
+ // minDatabaseVersion: database.version,
+ // upgradeMessageSchema,
+ // });
- console.log('Migrate database without attachments');
- await Migrations1DatabaseWithoutAttachmentData.run({
- Backbone,
- database: Whisper.Database,
- });
+ // console.log('Migrate database without attachments');
+ // await Migrations1DatabaseWithoutAttachmentData.run({
+ // Backbone,
+ // database: Whisper.Database,
+ // });
console.log('Storage fetch');
storage.fetch();
diff --git a/js/database.js b/js/database.js
index 6b1bb9f93cd..242e91a7b4b 100644
--- a/js/database.js
+++ b/js/database.js
@@ -6,7 +6,7 @@
(function () {
'use strict';
- const { Migrations1DatabaseWithoutAttachmentData } = window.Signal.Migrations;
+ const { Migrations0DatabaseWithAttachmentData } = window.Signal.Migrations;
window.Whisper = window.Whisper || {};
window.Whisper.Database = window.Whisper.Database || {};
@@ -123,5 +123,5 @@
request.onsuccess = resolve;
}));
- Whisper.Database.migrations = Migrations1DatabaseWithoutAttachmentData.migrations;
+ Whisper.Database.migrations = Migrations0DatabaseWithAttachmentData.migrations;
}());
diff --git a/js/modules/migrations/migrations_0_database_with_attachment_data.js b/js/modules/migrations/migrations_0_database_with_attachment_data.js
index 2c42b9e9075..a12e788ff27 100644
--- a/js/modules/migrations/migrations_0_database_with_attachment_data.js
+++ b/js/modules/migrations/migrations_0_database_with_attachment_data.js
@@ -8,7 +8,7 @@ const { runMigrations } = require('./run_migrations');
// any expensive operations, e.g. modifying all messages / attachments, etc., as
// it may cause out-of-memory errors for users with long histories:
// https://github.com/signalapp/Signal-Desktop/issues/2163
-const migrations = [
+exports.migrations = [
{
version: '12.0',
migrate(transaction, next) {
@@ -144,7 +144,7 @@ const migrations = [
const database = {
id: 'signal',
nolog: true,
- migrations,
+ migrations: exports.migrations,
};
exports.run = ({ Backbone } = {}) =>
@@ -152,5 +152,5 @@ exports.run = ({ Backbone } = {}) =>
exports.getDatabase = () => ({
name: database.id,
- version: last(migrations).version,
+ version: last(exports.migrations).version,
});
diff --git a/js/modules/migrations/migrations_1_database_without_attachment_data.js b/js/modules/migrations/migrations_1_database_without_attachment_data.js
index b10106ef202..a4fb3e87085 100644
--- a/js/modules/migrations/migrations_1_database_without_attachment_data.js
+++ b/js/modules/migrations/migrations_1_database_without_attachment_data.js
@@ -2,14 +2,14 @@ const { runMigrations } = require('./run_migrations');
exports.migrations = [
- {
- version: 18,
- async migrate(transaction, next) {
- console.log('Migration 18');
- console.log('Attachments stored on disk');
- next();
- },
- },
+ // {
+ // version: 18,
+ // async migrate(transaction, next) {
+ // console.log('Migration 18');
+ // console.log('Attachments stored on disk');
+ // next();
+ // },
+ // },
];
exports.run = runMigrations;