Permalink
Browse files

Changed interface for backup step

  • Loading branch information...
shuhaowu committed Jul 11, 2014
1 parent f4a65d9 commit 6d40aa115ad60d3ef1de44bac70474770159b0d2
Showing with 10 additions and 14 deletions.
  1. +10 −13 backup.go
  2. +0 −1 error.go
View
@@ -13,15 +13,6 @@ type Backup struct {
b *C.sqlite3_backup
}
-func IsDone(err error) bool {
- sqlErr, ok := err.(Error)
- if !ok {
- return false
- }
-
- return sqlErr.Code == ErrDone
-}
-
func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*Backup, error) {
destptr := C.CString(dest)
defer C.free(unsafe.Pointer(destptr))
@@ -34,12 +25,18 @@ func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*Backup,
return nil, c.lastError()
}
-func (b *Backup) Step(p int) error {
+// Backs up for one step. Calls the underlying `sqlite3_backup_step` function.
+// This function returns a boolean indicating if the backup is done and
+// an error signalling any other error. Done is returned if the underlying C
+// function returns SQLITE_DONE (Code 101)
+func (b *Backup) Step(p int) (bool, error) {
ret := C.sqlite3_backup_step(b.b, C.int(p))
- if ret != 0 {
- return Error{Code: ErrNo(ret)}
+ if ret == 101 {
+ return true, nil
+ } else if ret != 0 {
+ return false, Error{Code: ErrNo(ret)}
}
- return nil
+ return false, nil
}
func (b *Backup) Remaining() int {
View
@@ -45,7 +45,6 @@ var (
ErrNotADB = ErrNo(26) /* File opened that is not a database file */
ErrNotice = ErrNo(27) /* Notifications from sqlite3_log() */
ErrWarning = ErrNo(28) /* Warnings from sqlite3_log() */
- ErrDone = ErrNo(101)
)
func (err ErrNo) Error() string {

0 comments on commit 6d40aa1

Please sign in to comment.