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

revert 5253daf856 and add _busy_timeout query parameter.

This commit is contained in:
mattn 2015-03-22 03:02:03 +09:00
parent d7dbb909ec
commit d754d2db45
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sqlite3.go
View File

@ -260,14 +260,17 @@ func errorString(err Error) string {
// :memory: // :memory:
// file::memory: // file::memory:
// go-sqlite handle especially query parameters. // go-sqlite handle especially query parameters.
// loc=XXX // _loc=XXX
// Specify location of time format. It's possible to specify "auto". // Specify location of time format. It's possible to specify "auto".
// _busy_timeout=XXX
// Specify value for sqlite3_busy_timeout.
func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
if C.sqlite3_threadsafe() == 0 { if C.sqlite3_threadsafe() == 0 {
return nil, errors.New("sqlite library was not compiled for thread-safe operation") return nil, errors.New("sqlite library was not compiled for thread-safe operation")
} }
var loc *time.Location var loc *time.Location
busy_timeout := 5000
pos := strings.IndexRune(dsn, '?') pos := strings.IndexRune(dsn, '?')
if pos >= 1 { if pos >= 1 {
params, err := url.ParseQuery(dsn[pos+1:]) params, err := url.ParseQuery(dsn[pos+1:])
@ -275,18 +278,26 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
return nil, err return nil, err
} }
// loc // _loc
if val := params.Get("loc"); val != "" { if val := params.Get("_loc"); val != "" {
if val == "auto" { if val == "auto" {
loc = time.Local loc = time.Local
} else { } else {
loc, err = time.LoadLocation(val) loc, err = time.LoadLocation(val)
if err != nil { if err != nil {
return nil, fmt.Errorf("Invalid loc: %v: %v", val, err) return nil, fmt.Errorf("Invalid _loc: %v: %v", val, err)
} }
} }
} }
// _busy_timeout
if val := params.Get("_busy_timeout"); val != "" {
busy_timeout = int(strconv.ParseInt(val, 10, 64))
if err != nil {
return nil, fmt.Errorf("Invalid _busy_timeout: %v: %v", val, err)
}
}
if !strings.HasPrefix(dsn, "file:") { if !strings.HasPrefix(dsn, "file:") {
dsn = dsn[:pos] dsn = dsn[:pos]
} }
@ -307,7 +318,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
return nil, errors.New("sqlite succeeded without returning a database") return nil, errors.New("sqlite succeeded without returning a database")
} }
rv = C.sqlite3_busy_timeout(db, 5000) rv = C.sqlite3_busy_timeout(db, busy_timeout)
if rv != C.SQLITE_OK { if rv != C.SQLITE_OK {
return nil, Error{Code: ErrNo(rv)} return nil, Error{Code: ErrNo(rv)}
} }
@ -562,22 +573,16 @@ func (rc *SQLiteRows) Columns() []string {
// Move cursor to next. // Move cursor to next.
func (rc *SQLiteRows) Next(dest []driver.Value) error { func (rc *SQLiteRows) Next(dest []driver.Value) error {
for {
rv := C.sqlite3_step(rc.s.s) rv := C.sqlite3_step(rc.s.s)
if rv == C.SQLITE_DONE { if rv == C.SQLITE_DONE {
return io.EOF return io.EOF
} }
if rv == C.SQLITE_ROW { if rv != C.SQLITE_ROW {
break rv = C.sqlite3_reset(rc.s.s)
} if rv != C.SQLITE_OK {
if rv != C.SQLITE_BUSY && rv != C.SQLITE_LOCKED { return rc.s.c.lastError()
err := rc.s.c.lastError()
C.sqlite3_reset(rc.s.s)
if rc.nc > 0 {
C.sqlite3_clear_bindings(rc.s.s)
}
return err
} }
return nil
} }
if rc.decltype == nil { if rc.decltype == nil {