vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

pg: make `exec`, `q_int` and `q_strings` return an optional (#6554)

pull/6560/head
Leonardo Cecchi 2020-10-04 06:31:47 +02:00 committed by GitHub
parent c84848c417
commit 51987e17df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vlib/pg/pg.v
View File

@ -48,7 +48,7 @@ fn C.PQclear(arg_1 voidptr) voidptr
fn C.PQfinish(arg_1 voidptr) fn C.PQfinish(arg_1 voidptr)
// Makes a new connection to the database server using // connect makes a new connection to the database server using
// the parameters from the `Config` structure, returning // the parameters from the `Config` structure, returning
// a connection error when something goes wrong // a connection error when something goes wrong
pub fn connect(config Config) ?DB { pub fn connect(config Config) ?DB {
@ -94,11 +94,14 @@ pub fn (db DB) close() {
C.PQfinish(db.conn) C.PQfinish(db.conn)
} }
pub fn (db DB) q_int(query string) int { // q_int submit a command to the database server and
rows := db.exec(query) // returns an the first field in the first tuple
// converted to an int. If no row is found or on
// command failure, an error is returned
pub fn (db DB) q_int(query string) ?int {
rows := db.exec(query) ?
if rows.len == 0 { if rows.len == 0 {
println('q_int "$query" not found') return error('q_int "$query" not found')
return 0
} }
row := rows[0] row := rows[0]
if row.vals.len == 0 { if row.vals.len == 0 {
@ -108,11 +111,14 @@ pub fn (db DB) q_int(query string) int {
return val.int() return val.int()
} }
pub fn (db DB) q_string(query string) string { // q_int submit a command to the database server and
rows := db.exec(query) // returns an the first field in the first tuple
// as a string. If no row is found or on
// command failure, an error is returned
pub fn (db DB) q_string(query string) ?string {
rows := db.exec(query) ?
if rows.len == 0 { if rows.len == 0 {
println('q_string "$query" not found') return error('q_string "$query" not found')
return ''
} }
row := rows[0] row := rows[0]
if row.vals.len == 0 { if row.vals.len == 0 {
@ -122,17 +128,22 @@ pub fn (db DB) q_string(query string) string {
return val return val
} }
pub fn (db DB) q_strings(query string) []Row { // q_strings submit a command to the database server and
// returns the resulting row set. Alias of `exec`
pub fn (db DB) q_strings(query string) ?[]Row {
return db.exec(query) return db.exec(query)
} }
pub fn (db DB) exec(query string) []Row { // exec submit a command to the database server and wait
// for the result, returning an error on failure and a
// row set on success
pub fn (db DB) exec(query string) ?[]Row {
res := C.PQexec(db.conn, query.str) res := C.PQexec(db.conn, query.str)
e := unsafe {C.PQerrorMessage(db.conn).vstring()} e := unsafe {C.PQerrorMessage(db.conn).vstring()}
if e != '' { if e != '' {
println('pg exec error:') error_msg := '$e'
println(e) C.PQclear(res)
return res_to_rows(res) return error(error_msg)
} }
return res_to_rows(res) return res_to_rows(res)
} }