tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改删除重复记录字段

Browse Source
This commit is contained in:
laoyuyu
2019-07-26 21:37:49 +08:00
parent a5fc5d0bcf
commit 1fb9f13dae
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aria/src/main/java/com/arialyy/aria/orm/DBConfig.java
View File

@@ -38,7 +38,7 @@ class DBConfig {
static boolean DEBUG = false; static boolean DEBUG = false;
static Map<String, Class> mapping = new LinkedHashMap<>(); static Map<String, Class> mapping = new LinkedHashMap<>();
static String DB_NAME; static String DB_NAME;
static int VERSION = 52; static int VERSION = 53;
/** /**
* 是否将数据库保存在Sd卡，{@code true} 是 * 是否将数据库保存在Sd卡，{@code true} 是

12
Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
View File

@@ -100,7 +100,7 @@ final class SqlHelper extends SQLiteOpenHelper {
handle360AriaUpdate(db); handle360AriaUpdate(db);
} else if (oldVersion < 51) { } else if (oldVersion < 51) {
handle365Update(db); handle365Update(db);
} else if (oldVersion < 52) { } else if (oldVersion < 53) {
handle366Update(db); handle366Update(db);
} else { } else {
handleDbUpdate(db, null, null); handleDbUpdate(db, null, null);
@@ -240,12 +240,9 @@ final class SqlHelper extends SQLiteOpenHelper {
* 删除重复的repeat数据 * 删除重复的repeat数据
*/ */
private void delRepeatThreadRecord(SQLiteDatabase db) { private void delRepeatThreadRecord(SQLiteDatabase db) {
String repeatSql = String repeatSql = "DELETE FROM ThreadRecord WHERE (rowid) "
"DELETE FROM ThreadRecord WHERE (taskKey, threadId, endLocation) " + "IN (SELECT rowid FROM ThreadRecord GROUP BY taskKey, threadId, endLocation HAVING COUNT(*) > 1) "
+ "IN (SELECT taskKey, threadId, endLocation FROM ThreadRecord GROUP BY taskKey, threadId, endLocation " + "AND rowid NOT IN (SELECT MIN(rowid) FROM ThreadRecord GROUP BY taskKey, threadId, endLocation HAVING COUNT(*)> 1)";
+ "HAVING COUNT(*) > 1) AND rowid "
+ "NOT IN (SELECT MIN(rowid) FROM ThreadRecord GROUP BY taskKey, threadId, endLocation "
+ "HAVING COUNT(*)> 1)";
ALog.d(TAG, repeatSql); ALog.d(TAG, repeatSql);
db.execSQL(repeatSql); db.execSQL(repeatSql);
} }
@@ -262,6 +259,7 @@ final class SqlHelper extends SQLiteOpenHelper {
// 执行升级操作 // 执行升级操作
handleDbUpdate(db, modifyMap, null); handleDbUpdate(db, modifyMap, null);
delRepeatThreadRecord(db);
} }
/** /**