Merge branch 'master' into check_network

xiyoo0812 · Apr 19, 2024 · 76cbdc4 · 76cbdc4
2 parents 955be1c + e4c3b8c
commit 76cbdc4
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/script/driver/sqlite.lua b/script/driver/sqlite.lua
@@ -46,9 +46,9 @@ function Sqlite:register_prepare(sheet)
     }
 end
 
-function Sqlite:get_prepare(sheet)
+function Sqlite:get_prepare(sheet, primary_id)
     if not self.prepares[sheet] then
-        self:register_prepare(sheet)
+        self:init_sheet(sheet, primary_id)
     end
     return self.prepares[sheet]
 end
@@ -67,14 +67,14 @@ end
 
 function Sqlite:init_sheet(sheet, primary_id)
     log_debug("[Sqlite][init_sheet] sheet:{} primary_id:{}", sheet, primary_id)
-    self:register_prepare(sheet)
     self.driver.exec(sformat("CREATE TABLE IF NOT EXISTS '%s' (KEY %s PRIMARY KEY NOT NULL, VALUE BLOB);", sheet,
         type(primary_id) == "string" and "TEXT" or "INTEGER"))
+    self:register_prepare(sheet)
 end
 
 function Sqlite:put(primary_id, data, sheet)
     log_debug("[Sqlite][put] primary_id:{} data:{} sheet:{}", primary_id, data, sheet)
-    local rc = self:get_prepare(sheet).update.run(primary_id, data)
+    local rc = self:get_prepare(sheet, primary_id).update.run(primary_id, data)
     if rc ~= SQLITE_DONE then
         log_debug("[Sqlite][put] fail rc={}", rc)
         return false
@@ -84,15 +84,15 @@ end
 
 function Sqlite:get(primary_id, sheet)
     log_debug("[Sqlite][get] sheet:{} primary_id:{}", sheet, primary_id)
-    local rc, data = self:get_prepare(sheet).select.run(primary_id)
+    local rc, data = self:get_prepare(sheet, primary_id).select.run(primary_id)
     if rc == SQLITE_NFOUND or rc == SQLITE_DONE then
         return (data[1] and data[1].VALUE) and data[1].VALUE or {}, true
     end
     return {}, false
 end
 
 function Sqlite:del(primary_id, sheet)
-    local rc = self:get_prepare(sheet).delete.run(primary_id)
+    local rc = self:get_prepare(sheet, primary_id).delete.run(primary_id)
     return rc == SQLITE_NFOUND or rc == SQLITE_OK
 end