From bf135107d8333cc0a343917cbf58f004584cd800 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 27 Dec 2015 10:26:00 +0800 Subject: [PATCH] Fix individual and userOrder not updated when upgrading from <12 --- .../scala/com/github/shadowsocks/database/DBHelper.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/database/DBHelper.scala b/src/main/scala/com/github/shadowsocks/database/DBHelper.scala index e29c8548..7d6d5dbc 100644 --- a/src/main/scala/com/github/shadowsocks/database/DBHelper.scala +++ b/src/main/scala/com/github/shadowsocks/database/DBHelper.scala @@ -105,17 +105,14 @@ class DBHelper(val context: Context) " ipv6, individual FROM `tmp`;") profileDao.executeRawNoArgs("DROP TABLE `tmp`;") profileDao.executeRawNoArgs("COMMIT;") - return - } - - if (oldVersion < 13) { + } else if (oldVersion < 13) { profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN tx LONG;") profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN rx LONG;") profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN date VARCHAR;") } if (oldVersion < 15) { - profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN userOrder LONG;") + if (oldVersion >= 12) profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN userOrder LONG;") var i = 0 for (profile <- profileDao.queryForAll.asScala) { if (oldVersion < 14) profile.individual = updateProxiedApps(context, profile.individual)