From 98d277368f1532823a52f7ebeeca8c95a2d194c2 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 25 Jun 2014 21:51:22 -0700
Subject: [PATCH] Final migration step, remove identity_key column from keys
 table.

---
 src/main/resources/migrations.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/migrations.xml b/src/main/resources/migrations.xml
index dd8c2eb66..e6d225c32 100644
--- a/src/main/resources/migrations.xml
+++ b/src/main/resources/migrations.xml
@@ -167,4 +167,8 @@
         <sql>UPDATE accounts SET data = custom_json_object_set_key(data, 'identityKey', k.identity_key) FROM keys k WHERE (data->>'identityKey')::text is null AND k.number = data->>'number' AND k.last_resort = 1;</sql>
         <sql>UPDATE accounts SET data = custom_json_object_set_key(data, 'identityKey', k.identity_key) FROM keys k WHERE (data->>'identityKey')::text is null AND k.number = data->>'number';</sql>
     </changeSet>
+
+    <changeSet id="4" author="moxie">
+        <dropColumn tableName="keys" columnName="identity_key"/>
+    </changeSet>
 </databaseChangeLog>