mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

sqlite: add error struct for optional result (#10209)

Browse Source
This commit is contained in:
Anton Zavodchikov 2021-05-27 14:45:34 +05:00 committed by GitHub
parent d5cacd1e5f
commit 539594bfce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vlib/sqlite/sqlite.v
View File

@ -18,6 +18,11 @@ struct C.sqlite3 {
struct C.sqlite3_stmt { struct C.sqlite3_stmt {
} }
struct SQLError {
msg string
code int
}
// //
pub struct DB { pub struct DB {
pub mut: pub mut:
@ -68,8 +73,12 @@ fn C.sqlite3_free(voidptr)
// connect Opens the connection with a database. // connect Opens the connection with a database.
pub fn connect(path string) ?DB { pub fn connect(path string) ?DB {
db := &C.sqlite3(0) db := &C.sqlite3(0)
if C.sqlite3_open(&char(path.str), &db) != 0 { code := C.sqlite3_open(&char(path.str), &db)
return error('sqlite db error') if code != 0 {
return IError(&SQLError{
msg: unsafe { cstring_to_vstring(&char(C.sqlite3_errstr(code))) }
code: code
})
} }
return DB{ return DB{
conn: db conn: db
@ -85,7 +94,10 @@ pub fn (mut db DB) close() ?bool {
if code == 0 { if code == 0 {
db.is_open = false db.is_open = false
} else { } else {
return error('sqlite db error: failed to close with code: $code') return IError(&SQLError{
msg: unsafe { cstring_to_vstring(&char(C.sqlite3_errstr(code))) }
code: code
})
} }
return true // successfully closed return true // successfully closed
} }
@ -104,6 +116,7 @@ fn get_int_from_stmt(stmt &C.sqlite3_stmt) int {
if x != C.SQLITE_OK && x != C.SQLITE_DONE { if x != C.SQLITE_OK && x != C.SQLITE_DONE {
C.puts(C.sqlite3_errstr(x)) C.puts(C.sqlite3_errstr(x))
} }
res := C.sqlite3_column_int(stmt, 0) res := C.sqlite3_column_int(stmt, 0)
C.sqlite3_finalize(stmt) C.sqlite3_finalize(stmt)
return res return res
@ -114,6 +127,7 @@ pub fn (db DB) q_int(query string) int {
stmt := &C.sqlite3_stmt(0) stmt := &C.sqlite3_stmt(0)
C.sqlite3_prepare_v2(db.conn, &char(query.str), query.len, &stmt, 0) C.sqlite3_prepare_v2(db.conn, &char(query.str), query.len, &stmt, 0)
C.sqlite3_step(stmt) C.sqlite3_step(stmt)
res := C.sqlite3_column_int(stmt, 0) res := C.sqlite3_column_int(stmt, 0)
C.sqlite3_finalize(stmt) C.sqlite3_finalize(stmt)
return res return res
@ -122,11 +136,14 @@ pub fn (db DB) q_int(query string) int {
// Returns a single cell with value string. // Returns a single cell with value string.
pub fn (db DB) q_string(query string) string { pub fn (db DB) q_string(query string) string {
stmt := &C.sqlite3_stmt(0) stmt := &C.sqlite3_stmt(0)
defer {
C.sqlite3_finalize(stmt)
}
C.sqlite3_prepare_v2(db.conn, &char(query.str), query.len, &stmt, 0) C.sqlite3_prepare_v2(db.conn, &char(query.str), query.len, &stmt, 0)
C.sqlite3_step(stmt) C.sqlite3_step(stmt)
res := unsafe { tos_clone(&byte(C.sqlite3_column_text(stmt, 0))) }
C.sqlite3_finalize(stmt) val := unsafe { &byte(C.sqlite3_column_text(stmt, 0)) }
return res return if val != &byte(0) { unsafe { tos_clone(val) } } else { '' }
} }
// Execute the query on db, return an array of all the results, alongside any result code. // Execute the query on db, return an array of all the results, alongside any result code.
@ -146,8 +163,12 @@ pub fn (db DB) exec(query string) ([]Row, int) {
} }
mut row := Row{} mut row := Row{}
for i in 0 .. nr_cols { for i in 0 .. nr_cols {
val := unsafe { tos_clone(&byte(C.sqlite3_column_text(stmt, i))) } val := unsafe { &byte(C.sqlite3_column_text(stmt, i)) }
row.vals << val if val == &byte(0) {
row.vals << ''
} else {
row.vals << unsafe { tos_clone(val) }
}
} }
rows << row rows << row
} }
@ -159,8 +180,16 @@ pub fn (db DB) exec(query string) ([]Row, int) {
// Return the first row from the resulting table // Return the first row from the resulting table
pub fn (db DB) exec_one(query string) ?Row { pub fn (db DB) exec_one(query string) ?Row {
rows, code := db.exec(query) rows, code := db.exec(query)
if rows.len == 0 || code != 101 { if rows.len == 0 {
return error('SQL Error: Rows #$rows.len Return code $code') return IError(&SQLError{
msg: 'No rows'
code: code
})
} else if code != 101 {
return IError(&SQLError{
msg: unsafe { cstring_to_vstring(&char(C.sqlite3_errstr(code))) }
code: code
})
} }
return rows[0] return rows[0]
} }