From f4a65d949702da27df3f49e90d67bd388fd2d429 Mon Sep 17 00:00:00 2001
From: Shuhao Wu <shuhao@shuhaowu.com>
Date: Thu, 10 Jul 2014 16:23:05 -0400
Subject: [PATCH 1/2] Added an IsDone method for backup

---
 backup.go | 9 +++++++++
 error.go  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/backup.go b/backup.go
index 2684cc0..1097543 100644
--- a/backup.go
+++ b/backup.go
@@ -13,6 +13,15 @@ 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))
diff --git a/error.go b/error.go
index 52017bf..1634939 100644
--- a/error.go
+++ b/error.go
@@ -45,6 +45,7 @@ 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 {

From 6d40aa115ad60d3ef1de44bac70474770159b0d2 Mon Sep 17 00:00:00 2001
From: Shuhao Wu <shuhao@shuhaowu.com>
Date: Fri, 11 Jul 2014 10:31:28 -0400
Subject: [PATCH 2/2] Changed interface for backup step

---
 backup.go | 23 ++++++++++-------------
 error.go  |  1 -
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/backup.go b/backup.go
index 1097543..ab56961 100644
--- a/backup.go
+++ b/backup.go
@@ -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 {
diff --git a/error.go b/error.go
index 1634939..52017bf 100644
--- a/error.go
+++ b/error.go
@@ -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 {