diff options
author | 2018-01-14 08:39:37 -0600 | |
---|---|---|
committer | 2018-01-14 08:39:37 -0600 | |
commit | 380bff22029f3088e026687df2a0d39c4915f58b (patch) | |
tree | ecf7526030ad1645398b99d00c3cebe79a93f99d /plugins/data/load_dat.lua | |
parent | cea7ff08ace1cadc22d80074c6c734568a2ad93e (diff) |
plugins/data: don't pollute the namespace and use emu.print_error (nw)
Diffstat (limited to 'plugins/data/load_dat.lua')
-rw-r--r-- | plugins/data/load_dat.lua | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua index 9f365921328..3521820f078 100644 --- a/plugins/data/load_dat.lua +++ b/plugins/data/load_dat.lua @@ -1,5 +1,5 @@ local datfile = {} -local db, sql = require("data/database")() +local db = require("data/database") function datfile.open(file, vertag, fixupcb) if not db then @@ -7,11 +7,11 @@ function datfile.open(file, vertag, fixupcb) end local function read(tag1, tag2, set) local data - local stmt = db:prepare("SELECT f.data FROM \"" .. file .. "_idx\" AS fi, \"" .. file .. [[" + local stmt = db.prepare("SELECT f.data FROM \"" .. file .. "_idx\" AS fi, \"" .. file .. [[" AS f WHERE fi.type = ? AND fi.val = ? AND fi.romset = ? AND f.rowid = fi.data]]) - check_db("reading " .. tag1 .. " - " .. tag2 .. " - " .. set) + db.check("reading " .. tag1 .. " - " .. tag2 .. " - " .. set) stmt:bind_values(tag1, tag2, set) - if stmt:step() == sql.ROW then + if stmt:step() == db.ROW then data = stmt:get_value(0) end stmt:finalize() @@ -32,10 +32,10 @@ function datfile.open(file, vertag, fixupcb) -- remove unsafe chars from file for use in sql statement file = file:gsub("[^%w%._]", "") - local stmt = db:prepare("SELECT version FROM version WHERE datfile = ?") - check_db("reading version") + local stmt = db.prepare("SELECT version FROM version WHERE datfile = ?") + db.check("reading version") stmt:bind_values(file) - if stmt:step() == sql.ROW then + if stmt:step() == db.ROW then dbver = stmt:get_value(0) end stmt:finalize() @@ -46,16 +46,16 @@ function datfile.open(file, vertag, fixupcb) elseif not fh then return nil elseif not dbver then - db:exec("CREATE TABLE \"" .. file .. [[_idx" ( + db.exec("CREATE TABLE \"" .. file .. [[_idx" ( type VARCHAR NOT NULL, val VARCHAR NOT NULL, romset VARCHAR NOT NULL, data INTEGER NOT NULL)]]) - check_db("creating index") - db:exec("CREATE TABLE \"" .. file .. "\" (data CLOB NOT NULL)") - check_db("creating table") - db:exec("CREATE INDEX \"typeval_" .. file .. "\" ON \"" .. file .. "_idx\"(type, val)") - check_db("creating typeval index") + db.check("creating index") + db.exec("CREATE TABLE \"" .. file .. "\" (data CLOB NOT NULL)") + db.check("creating table") + db.exec("CREATE INDEX \"typeval_" .. file .. "\" ON \"" .. file .. "_idx\"(type, val)") + db.check("creating typeval index") end if vertag then @@ -76,15 +76,15 @@ function datfile.open(file, vertag, fixupcb) end if dbver then - db:exec("DELETE FROM \"" .. file .. "\"") - check_db("deleting") - db:exec("DELETE FROM \"" .. file .. "_idx\"") - check_db("deleting index") - stmt = db:prepare("UPDATE version SET version = ? WHERE datfile = ?") - check_db("updating version") + db.exec("DELETE FROM \"" .. file .. "\"") + db.check("deleting") + db.exec("DELETE FROM \"" .. file .. "_idx\"") + db.check("deleting index") + stmt = db.prepare("UPDATE version SET version = ? WHERE datfile = ?") + db.check("updating version") else - stmt = db:prepare("INSERT INTO version VALUES (?, ?)") - check_db("inserting version") + stmt = db.prepare("INSERT INTO version VALUES (?, ?)") + db.check("inserting version") end stmt:bind_values(ver, file) stmt:step() @@ -94,8 +94,8 @@ function datfile.open(file, vertag, fixupcb) local inblock = false fh:seek("set") local buffer = fh:read("a") - db:exec("BEGIN TRANSACTION") - check_db("beginning transaction") + db.exec("BEGIN TRANSACTION") + db.check("beginning transaction") local function gmatchpos() local pos = 1 local function iter() @@ -136,8 +136,8 @@ function datfile.open(file, vertag, fixupcb) if fixupcb then data = fixupcb(data) end - stmt = db:prepare("INSERT INTO \"" .. file .. "\" VALUES (?)") - check_db("inserting values") + stmt = db.prepare("INSERT INTO \"" .. file .. "\" VALUES (?)") + db.check("inserting values") stmt:bind_values(data) stmt:step() local row = stmt:last_insert_rowid() @@ -147,8 +147,8 @@ function datfile.open(file, vertag, fixupcb) if fixupcb then fixupcb(data) end - stmt = db:prepare("INSERT INTO \"" .. file .. "_idx\" VALUES (?, ?, ?, ?)") - check_db("inserting into index") + stmt = db.prepare("INSERT INTO \"" .. file .. "_idx\" VALUES (?, ?, ?, ?)") + db.check("inserting into index") stmt:bind_values(tag1, tag2, set, row) stmt:step() stmt:finalize() @@ -157,8 +157,8 @@ function datfile.open(file, vertag, fixupcb) end end end - db:exec("END TRANSACTION") - check_db("ending transaction") + db.exec("END TRANSACTION") + db.check("ending transaction") end fh:close() |