re
/
go-sqlite3
forked from mirror/go-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hang in test

This commit is contained in:
mattn 2015-03-22 03:37:43 +09:00
parent c1abf95b38
commit 1354684d2b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sqlite3.go
View File

@ -382,17 +382,18 @@ func (c *SQLiteConn) Prepare(query string) (driver.Stmt, error) {
t = strings.TrimSpace(C.GoString(tail)) t = strings.TrimSpace(C.GoString(tail))
} }
nv := int(C.sqlite3_bind_parameter_count(s)) nv := int(C.sqlite3_bind_parameter_count(s))
if nv > 0 { /*
pn := C.GoString(C.sqlite3_bind_parameter_name(s, 1)) if nv > 0 {
/* TODO: map argument for named parameters pn := C.GoString(C.sqlite3_bind_parameter_name(s, 1))
if len(pn) > 0 && pn[0] == '$' && pn[1] != '1' { // TODO: map argument for named parameters
nv = -1 if len(pn) > 0 && pn[0] == '$' && pn[1] != '1' {
nv = -1
}
if len(pn) > 0 && pn[0] != '?' {
nv = -1
}
} }
*/ */
if len(pn) > 0 && pn[0] != '?' {
nv = -1
}
}
ss := &SQLiteStmt{c: c, s: s, nv: nv, t: t} ss := &SQLiteStmt{c: c, s: s, nv: nv, t: t}
runtime.SetFinalizer(ss, (*SQLiteStmt).Close) runtime.SetFinalizer(ss, (*SQLiteStmt).Close)
return ss, nil return ss, nil
@ -440,7 +441,6 @@ func (s *SQLiteStmt) bind(args []driver.Value) error {
for k, v := range m { for k, v := range m {
pn := C.CString(k) pn := C.CString(k)
if pi := int(C.sqlite3_bind_parameter_index(s.s, pn)); pi > 0 { if pi := int(C.sqlite3_bind_parameter_index(s.s, pn)); pi > 0 {
println(pi)
vargs = append(vargs, bindArg{pi, v}) vargs = append(vargs, bindArg{pi, v})
} }
C.free(unsafe.Pointer(pn)) C.free(unsafe.Pointer(pn))
@ -503,6 +503,7 @@ func (s *SQLiteStmt) bind(args []driver.Value) error {
return s.c.lastError() return s.c.lastError()
} }
} }
println(4)
return nil return nil
} }