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

dora4 · Nov 8, 2024 · 22453f8 · 22453f8
1 parent 700d886
commit 22453f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 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.13"
+                version = "2.5.14"
             }
         }
     }

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