mirror
/
go-sqlite3
mirror of https://github.com/mattn/go-sqlite3.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix build

This commit is contained in:
Yasuhiro Matsumoto 2017-03-20 23:31:22 +09:00
parent cf4bd560f1
commit 997cab8094
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backup.go
View File

@ -48,7 +48,7 @@ func (b *SQLiteBackup) Step(p int) (bool, error) {
if ret == C.SQLITE_DONE { if ret == C.SQLITE_DONE {
return true, nil return true, nil
} else if ret != 0 && ret != C.SQLITE_LOCKED && ret != C.SQLITE_BUSY { } else if ret != 0 && ret != C.SQLITE_LOCKED && ret != C.SQLITE_BUSY {
return false, Error{Code: ErrNo(ret)} return false, &Error{Code: ErrNo(ret)}
} }
return false, nil return false, nil
} }
@ -79,7 +79,7 @@ func (b *SQLiteBackup) Close() error {
runtime.SetFinalizer(b, nil) runtime.SetFinalizer(b, nil)
if ret != 0 { if ret != 0 {
return Error{Code: ErrNo(ret)} return &Error{Code: ErrNo(ret)}
} }
return nil return nil
} }

4
error.go
View File

@ -58,7 +58,7 @@ var (
// Error return error message from errno. // Error return error message from errno.
func (err ErrNo) Error() string { func (err ErrNo) Error() string {
return Error{Code: err}.Error() return (&Error{Code: err}).Error()
} }
// Extend return extended errno. // Extend return extended errno.
@ -68,7 +68,7 @@ func (err ErrNo) Extend(by int) ErrNoExtended {
// Error return error message that is extended code. // Error return error message that is extended code.
func (err ErrNoExtended) Error() string { func (err ErrNoExtended) Error() string {
return Error{Code: ErrNo(C.int(err) & ErrNoMask), ExtendedCode: err}.Error() return (&Error{Code: ErrNo(C.int(err) & ErrNoMask), ExtendedCode: err}).Error()
} }
// Error return error message. // Error return error message.

6
sqlite3.go
View File

@ -404,7 +404,7 @@ func (c *SQLiteConn) lastError() *Error {
if rv == C.SQLITE_OK { if rv == C.SQLITE_OK {
return nil return nil
} }
return Error{ return &Error{
Code: ErrNo(rv), Code: ErrNo(rv),
ExtendedCode: ErrNoExtended(C.sqlite3_extended_errcode(c.db)), ExtendedCode: ErrNoExtended(C.sqlite3_extended_errcode(c.db)),
err: C.GoString(C.sqlite3_errmsg(c.db)), err: C.GoString(C.sqlite3_errmsg(c.db)),
@ -601,7 +601,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
C.SQLITE_OPEN_CREATE, C.SQLITE_OPEN_CREATE,
nil) nil)
if rv != 0 { if rv != 0 {
return nil, Error{Code: ErrNo(rv)} return nil, &Error{Code: ErrNo(rv)}
} }
if db == nil { if db == nil {
return nil, errors.New("sqlite succeeded without returning a database") return nil, errors.New("sqlite succeeded without returning a database")
@ -609,7 +609,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
rv = C.sqlite3_busy_timeout(db, C.int(busyTimeout)) rv = C.sqlite3_busy_timeout(db, C.int(busyTimeout))
if rv != C.SQLITE_OK { if rv != C.SQLITE_OK {
return nil, Error{Code: ErrNo(rv)} return nil, &Error{Code: ErrNo(rv)}
} }
conn := &SQLiteConn{db: db, loc: loc, txlock: txlock} conn := &SQLiteConn{db: db, loc: loc, txlock: txlock}