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

dora4 · Nov 8, 2024 · 700d886 · 700d886
1 parent 21aeb86
commit 700d886
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 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.12"
+                version = "2.5.13"
             }
         }
     }

diff --git a/dcache/src/main/java/dora/db/OrmSQLiteOpenHelper.kt b/dcache/src/main/java/dora/db/OrmSQLiteOpenHelper.kt
@@ -79,7 +79,7 @@ class OrmSQLiteOpenHelper(private val context: Context, name: String, version: I
                 ormTable?.let {
                     val isRecreated = it.isUpgradeRecreated
                     if (isRecreated) {
-                        Transaction.execute {
+                        Transaction.execute(db) {
                             TableManager.dropTable(table)
                             TableManager.createTable(table)
                         }

diff --git a/dcache/src/main/java/dora/db/Transaction.kt b/dcache/src/main/java/dora/db/Transaction.kt
@@ -18,8 +18,31 @@ object Transaction {
      * [execute] function.
      * 简体中文：[android.database.sqlite.SQLiteDatabase]对象，可以在[execute]函数中直接使用。
      */
-    val db by lazy {
-        Orm.getDB()
+    val db: SQLiteDatabase
+        get() = Orm.getDB()
+
+    /**
+     * Execute a general transaction block.
+     * 简体中文：执行通用事务块。
+     */
+    internal fun <T> execute(db: SQLiteDatabase, block: Transaction.() -> T) : Any = apply {
+        try {
+            // Begin the transaction.
+            // 简体中文：开始事务
+            db.beginTransaction()
+            // Execute the transaction operation.
+            // 简体中文：执行事务操作
+            block()
+            // Set the flag indicating that all operations were executed successfully.
+            // 简体中文：设置所有操作执行成功的标志位
+            db.setTransactionSuccessful()
+        } catch (e: SQLiteException) {
+            e.printStackTrace()
+        } finally {
+            // End the transaction.
+            // 简体中文：结束事务
+            db.endTransaction()
+        }
     }
 
     /**