From a18e46281770cca3f662ea1f328082f3a7c19103 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 28 Mar 2018 17:04:17 -0400
Subject: [PATCH] Move migrations to `Signal.Migrations`

---
 js/background.js | 2 +-
 js/database.js   | 2 +-
 preload.js       | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/js/background.js b/js/background.js
index 3516cb0e7..38d1c683c 100644
--- a/js/background.js
+++ b/js/background.js
@@ -20,7 +20,7 @@
     const {
         Migrations0DatabaseWithAttachmentData,
         Migrations1DatabaseWithoutAttachmentData,
-    } = window.Signal.Database;
+    } = window.Signal.Migrations;
     const { Views } = window.Signal;
 
     // Implicitly used in `indexeddb-backbonejs-adapter`:
diff --git a/js/database.js b/js/database.js
index db0688d35..6b1bb9f93 100644
--- a/js/database.js
+++ b/js/database.js
@@ -6,7 +6,7 @@
 (function () {
   'use strict';
 
-  const { Migrations1DatabaseWithoutAttachmentData } = window.Signal.Database;
+  const { Migrations1DatabaseWithoutAttachmentData } = window.Signal.Migrations;
 
   window.Whisper = window.Whisper || {};
   window.Whisper.Database = window.Whisper.Database || {};
diff --git a/preload.js b/preload.js
index 9509f30fe..4ff2e4d41 100644
--- a/preload.js
+++ b/preload.js
@@ -124,16 +124,15 @@
   window.Signal = {};
   window.Signal.Backup = require('./js/modules/backup');
   window.Signal.Crypto = require('./js/modules/crypto');
-  window.Signal.Database = {};
-  window.Signal.Database.Migrations0DatabaseWithAttachmentData =
-    require('./js/modules/migrations/migrations_0_database_with_attachment_data');
-  window.Signal.Database.Migrations1DatabaseWithoutAttachmentData =
-    require('./js/modules/migrations/migrations_1_database_without_attachment_data');
   window.Signal.Logs = require('./js/modules/logs');
   window.Signal.Migrations = {};
   window.Signal.Migrations.loadAttachmentData = Attachment.loadData(readAttachmentData);
   window.Signal.Migrations.deleteAttachmentData = Attachment.deleteData(deleteAttachmentData);
   window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema;
+  window.Signal.Migrations.Migrations0DatabaseWithAttachmentData =
+    require('./js/modules/migrations/migrations_0_database_with_attachment_data');
+  window.Signal.Migrations.Migrations1DatabaseWithoutAttachmentData =
+    require('./js/modules/migrations/migrations_1_database_without_attachment_data');
   window.Signal.OS = require('./js/modules/os');
   window.Signal.Types = {};
   window.Signal.Types.Attachment = Attachment;