From d5154bef732086f1a460449e6dd62a19b530861b Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 8 Nov 2018 12:13:08 +1100
Subject: [PATCH] Move version 7 schema to version 6.

---
 app/sql.js | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index 1da98a7ba..d7360c9d7 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -425,6 +425,7 @@ async function updateToSchemaVersion6(currentVersion, instance) {
   await instance.run(
     `CREATE TABLE preKeys(
       id INTEGER PRIMARY KEY ASC,
+      recipient STRING,
       json TEXT
     );`
   );
@@ -435,21 +436,6 @@ async function updateToSchemaVersion6(currentVersion, instance) {
     );`
   );
 
-  await instance.run('PRAGMA schema_version = 6;');
-  await instance.run('COMMIT TRANSACTION;');
-  console.log('updateToSchemaVersion6: success!');
-}
-
-async function updateToSchemaVersion7(currentVersion, instance) {
-  if (currentVersion >= 7) {
-    return;
-  }
-  console.log('updateToSchemaVersion7: starting...');
-  await instance.run('BEGIN TRANSACTION;');
-
-  // Add recipient row
-  await instance.run('ALTER TABLE preKeys ADD recipient STRING;');
-
   await instance.run(
     `CREATE TABLE contactPreKeys(
       id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -468,9 +454,9 @@ async function updateToSchemaVersion7(currentVersion, instance) {
     );`
   );
 
-  await instance.run('PRAGMA schema_version = 7;');
+  await instance.run('PRAGMA schema_version = 6;');
   await instance.run('COMMIT TRANSACTION;');
-  console.log('updateToSchemaVersion7: success!');
+  console.log('updateToSchemaVersion6: success!');
 }
 
 const SCHEMA_VERSIONS = [
@@ -480,7 +466,6 @@ const SCHEMA_VERSIONS = [
   updateToSchemaVersion4,
   // version 5 was dropped
   updateToSchemaVersion6,
-  updateToSchemaVersion7, // Loki schema
 ];
 
 async function updateSchema(instance) {