2 files changed, 23 insertions, 9 deletions

diff --git a/backup.go b/backup.go
index 4b2a72d..9345209 100644
--- a/backup.go
+++ b/backup.go
@@ -11,21 +11,24 @@ package sqlite3
 */
 import "C"
 import (
+	"runtime"
 	"unsafe"
 )
 
-type Backup struct {
+type SQLiteBackup struct {
 	b *C.sqlite3_backup
 }
 
-func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*Backup, error) {
+func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*SQLiteBackup, error) {
 	destptr := C.CString(dest)
 	defer C.free(unsafe.Pointer(destptr))
 	srcptr := C.CString(src)
 	defer C.free(unsafe.Pointer(srcptr))
 
 	if b := C.sqlite3_backup_init(c.db, destptr, conn.db, srcptr); b != nil {
-		return &Backup{b: b}, nil
+		bb := &SQLiteBackup{b: b}
+		runtime.SetFinalizer(bb, (*SQLiteBackup).Finish)
+		return bb, nil
 	}
 	return nil, c.lastError()
 }
@@ -34,7 +37,7 @@ func (c *SQLiteConn) Backup(dest string, conn *SQLiteConn, src string) (*Backup,
 // 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) {
+func (b *SQLiteBackup) Step(p int) (bool, error) {
 	ret := C.sqlite3_backup_step(b.b, C.int(p))
 	if ret == C.SQLITE_DONE {
 		return true, nil
@@ -44,18 +47,24 @@ func (b *Backup) Step(p int) (bool, error) {
 	return false, nil
 }
 
-func (b *Backup) Remaining() int {
+func (b *SQLiteBackup) Remaining() int {
 	return int(C.sqlite3_backup_remaining(b.b))
 }
 
-func (b *Backup) PageCount() int {
+func (b *SQLiteBackup) PageCount() int {
 	return int(C.sqlite3_backup_pagecount(b.b))
 }
 
-func (b *Backup) Finish() error {
+func (b *SQLiteBackup) Finish() error {
+	return b.Close()
+}
+
+func (b *SQLiteBackup) Close() error {
 	ret := C.sqlite3_backup_finish(b.b)
 	if ret != 0 {
 		return Error{Code: ErrNo(ret)}
 	}
+	b.b = nil
+	runtime.SetFinalizer(b, nil)
 	return nil
 }
diff --git a/sqlite3.go b/sqlite3.go
index abfc2fe..de1cc16 100644
--- a/sqlite3.go
+++ b/sqlite3.go
@@ -61,6 +61,7 @@ import (
 	"database/sql/driver"
 	"errors"
 	"io"
+	"runtime"
 	"strings"
 	"time"
 	"unsafe"
@@ -306,7 +307,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 			return nil, err
 		}
 	}
-
+	runtime.SetFinalizer(conn, (*SQLiteConn).Close)
 	return conn, nil
 }
 
@@ -317,6 +318,7 @@ func (c *SQLiteConn) Close() error {
 		return c.lastError()
 	}
 	c.db = nil
+	runtime.SetFinalizer(c, nil)
 	return nil
 }
 
@@ -334,7 +336,9 @@ func (c *SQLiteConn) Prepare(query string) (driver.Stmt, error) {
 	if tail != nil && C.strlen(tail) > 0 {
 		t = strings.TrimSpace(C.GoString(tail))
 	}
-	return &SQLiteStmt{c: c, s: s, t: t}, nil
+	ss := &SQLiteStmt{c: c, s: s, t: t}
+	runtime.SetFinalizer(ss, (*SQLiteStmt).Close)
+	return ss, nil
 }
 
 // Close the statement.
@@ -350,6 +354,7 @@ func (s *SQLiteStmt) Close() error {
 	if rv != C.SQLITE_OK {
 		return s.c.lastError()
 	}
+	runtime.SetFinalizer(s, nil)
 	return nil
 }