Optimize the logic related to table structure upgrade.(#15)

dora4 · Nov 8, 2024 · 9327252 · 9327252
1 parent 3aa3778
commit 9327252
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/dcache/build.gradle.kts b/dcache/build.gradle.kts
@@ -53,7 +53,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.dora4"
                 artifactId = "dcache-android"
-                version = "2.5.7"
+                version = "2.5.8"
             }
         }
     }

diff --git a/dcache/src/main/java/dora/db/Orm.kt b/dcache/src/main/java/dora/db/Orm.kt
@@ -32,9 +32,8 @@ object Orm {
         val name: String = config.databaseName
         val versionCode: Int = config.versionCode
         val tables: Array<Class<out OrmTable>>? = config.tables
-        dbHelper = OrmSQLiteOpenHelper(context, name, versionCode, tables)
         database = dbHelper!!.writableDatabase
-        prepare()
+        prepare(context, name, versionCode, tables)
         dbHelper!!.onCreate(database)
     }
 
@@ -45,7 +44,18 @@ object Orm {
         throw OrmStateException("Database is not exists.")
     }
 
-    fun prepare() {
+    fun prepare(helper: OrmSQLiteOpenHelper) {
+        dbHelper = helper
+        dbState = STATE_DATABASE_EXISTS
+    }
+
+    fun prepare(
+        context: Context,
+        name: String,
+        versionCode: Int,
+        tables: Array<Class<out OrmTable>>?
+    ) {
+        dbHelper = OrmSQLiteOpenHelper(context, name, versionCode, tables)
         dbState = STATE_DATABASE_EXISTS
     }
 

diff --git a/dcache/src/main/java/dora/db/OrmSQLiteOpenHelper.kt b/dcache/src/main/java/dora/db/OrmSQLiteOpenHelper.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.database.DatabaseErrorHandler
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import dora.db.dao.OrmDao
 import dora.db.exception.OrmMigrationException
 import dora.db.migration.OrmMigration
 import dora.db.table.OrmTable
@@ -19,7 +18,7 @@ import java.lang.reflect.InvocationTargetException
  * 简体中文：一个帮助类，用于管理数据库的创建和版本管理。你需要在[Orm.init]函数中创建所有表，不建议使用
  * [TableManager]自行创建表。如果你需要升级数据的表结构，需要使用[OrmMigration]的数组指定每一次版本的变动。
  */
-class OrmSQLiteOpenHelper(context: Context, name: String, version: Int,
+class OrmSQLiteOpenHelper(private val context: Context, name: String, version: Int,
                           private val tables: Array<Class<out OrmTable>>?) :
         SQLiteOpenHelper(context, name, null, version, DatabaseErrorHandler {
             dbObj -> OrmLog.e(dbObj.toString()) }) {
@@ -100,7 +99,7 @@ class OrmSQLiteOpenHelper(context: Context, name: String, version: Int,
                                 continue
                             }
                             if (migration.fromVersion == curVersion) {
-                                Orm.prepare()
+                                Orm.prepare(this)
                                 val ok = Transaction.execute(it.javaClass as Class<out OrmTable>) { dao ->
                                     migration.migrate(dao)
                                 } as Boolean