Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android

2015-12-27 10:22:57 +08:00
parent d8ab3733dc 9feb5bd96a
commit 5a3d2c07bc
1 changed files with 5 additions and 1 deletions
@@ -105,11 +105,15 @@ class DBHelper(val context: Context)
          " ipv6, individual FROM `tmp`;")
        profileDao.executeRawNoArgs("DROP TABLE `tmp`;")
        profileDao.executeRawNoArgs("COMMIT;")
-      } else if (oldVersion < 13) {
+        return
+      }
+
+      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;")
        var i = 0