diff --git a/app/build.gradle b/app/build.gradle index 2dda60c..69827a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,6 +65,5 @@ dependencies { // add library compile 'me.leolin:ShortcutBadger:1.1.19@aar' annotationProcessor 'com.google.dagger:dagger-compiler:2.12' - //implementation project(':processor') compile files('libs/processor.jar') } diff --git a/app/libs/processor.jar b/app/libs/processor.jar index f4074fc..6bc1791 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/assets/migrations/1.sql b/app/src/main/assets/migrations/1.sql index a23d093..6ac2fbd 100644 --- a/app/src/main/assets/migrations/1.sql +++ b/app/src/main/assets/migrations/1.sql @@ -1,3 +1,2 @@ ALTER table message add COLUMN test TEXT -UPDATE message SET test = 'sql默认' WHERE test= NULL--试过了，执行了，但是没有结果，并没有更新数据库内容,可以使用下面的语句代替 尽量不要使用注释 -UPDATE message SET test = '' WHERE test= NULL +UPDATE message SET test = 'sql默认' WHERE test= NULL diff --git a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java index cd0e563..190f272 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java +++ b/app/src/main/java/com/shunzhi/parent/bean/message/PHMessage.java @@ -3,16 +3,13 @@ package com.shunzhi.parent.bean.message; import com.shunzhi.parent.AppContext; import org.greenrobot.greendao.annotation.Entity; +import org.greenrobot.greendao.annotation.Generated; import org.greenrobot.greendao.annotation.Id; import org.greenrobot.greendao.annotation.Keep; import org.greenrobot.greendao.annotation.NotNull; import java.util.Collection; -import java.util.Collections; import java.util.Date; -import java.util.List; - -import org.greenrobot.greendao.annotation.Generated; /** * 内部变量可能存在值为null，使用时要注意 @@ -37,8 +34,8 @@ public class PHMessage { @Generated(hash = 1935192071) public PHMessage(Long id, Date date, String messageId, String sessionId, - @NotNull String messageText, String exValue, String filePath, String fileUrl, - String messageType, Integer sendState, Integer sessionType) { + @NotNull String messageText, String exValue, String filePath, String fileUrl, + String messageType, Integer sendState, Integer sessionType) { this.id = id; this.date = date; this.messageId = messageId; diff --git a/processor/src/main/java/org/shunzhi/processorlibs/AddColumn.java b/processor/src/main/java/org/shunzhi/processorlibs/AddColumn.java index c02f58c..1e8eb9d 100644 --- a/processor/src/main/java/org/shunzhi/processorlibs/AddColumn.java +++ b/processor/src/main/java/org/shunzhi/processorlibs/AddColumn.java @@ -15,7 +15,7 @@ public @interface AddColumn { String type(); - boolean isDebug() default true; + boolean isDebug() default false; String type_string = "string"; String type_boolean = "boolean"; diff --git a/processor/src/main/java/org/shunzhi/processorlibs/VersionProcessor.java b/processor/src/main/java/org/shunzhi/processorlibs/VersionProcessor.java index 8cbffc8..506ebb0 100644 --- a/processor/src/main/java/org/shunzhi/processorlibs/VersionProcessor.java +++ b/processor/src/main/java/org/shunzhi/processorlibs/VersionProcessor.java @@ -1,7 +1,9 @@ package org.shunzhi.processorlibs; +import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; +import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.OutputStreamWriter; @@ -65,7 +67,7 @@ public class VersionProcessor extends AbstractProcessor { sql = String.format(sql_insert, tableName, element.getSimpleName().toString(), "INTEGER"); if (!isDebug) set.add(sql); - } else if (type.equalsIgnoreCase("boolean")){ + } else if (type.equalsIgnoreCase("boolean")) { sql = String.format(sql_insert, tableName, element.getSimpleName().toString(), "INTEGER"); if (!isDebug) set.add(sql); @@ -90,20 +92,37 @@ public class VersionProcessor extends AbstractProcessor { } File tmp = new File("tmp"); // File migrations = new File(tmp.getParentFile(), "app\\src\\main\\assets\\migrations\\".replace("\\", File.separator)); -// if (migrations.exists() || migrations.mkdirs()) { +// if (migrations.exists()) { // File[] files = migrations.listFiles(); // if (files != null) // for (File f : files) { -// if (!f.getName().equals("1.sql") && f.getName().endsWith(".sql")) f.delete(); +// try { +// Integer existVersion = Integer.parseInt(f.getName().replace(".sql", "")); +// if (existVersion < 2) continue; +// if (!map.containsKey(existVersion)) { +// f.delete(); +// } +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } // } // } for (Integer version : map.keySet()) { try { String path = "app\\src\\main\\assets\\migrations\\".replace("\\", File.separator) + version + ".sql"; File file = new File(tmp.getParentFile(), path); + Set set = map.get(version); + if (file.exists()) { + BufferedReader br = new BufferedReader(new FileReader(file)); + String buffer; + for (; (buffer = br.readLine()) != null; ) { + set.add(buffer); + } + br.close(); + } BufferedWriter bw = new BufferedWriter(new FileWriter(file)); StringBuilder builder = new StringBuilder(); - for (String str : map.get(version)) { + for (String str : set) { builder.append(str); builder.append("\r\n"); } diff --git a/sql.txt b/sql.txt index 5354dfd..e69de29 100644 --- a/sql.txt +++ b/sql.txt @@ -1 +0,0 @@ -3 ALTER table test ADD COLUMN area INTEGER -- libgit2 0.21.0