From e37121d4ea9b7f071a2ae681dd64b4fdfcda0987 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 4 Sep 2015 11:16:27 -0700 Subject: introduce ability to pass sqlite_omit_load_extension sqlite_omit_load_extension is a go build tag which behaves much like its C counterpart SQLITE_OMIT_LOAD_EXTENSION Signed-off-by: Jessica Frazelle --- sqlite3.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'sqlite3.go') diff --git a/sqlite3.go b/sqlite3.go index d57d9fb..e2a3796 100644 --- a/sqlite3.go +++ b/sqlite3.go @@ -355,23 +355,8 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { conn := &SQLiteConn{db: db, loc: loc, txlock: txlock} if len(d.Extensions) > 0 { - rv = C.sqlite3_enable_load_extension(db, 1) - if rv != C.SQLITE_OK { - return nil, errors.New(C.GoString(C.sqlite3_errmsg(db))) - } - - for _, extension := range d.Extensions { - cext := C.CString(extension) - defer C.free(unsafe.Pointer(cext)) - rv = C.sqlite3_load_extension(db, cext, nil, nil) - if rv != C.SQLITE_OK { - return nil, errors.New(C.GoString(C.sqlite3_errmsg(db))) - } - } - - rv = C.sqlite3_enable_load_extension(db, 0) - if rv != C.SQLITE_OK { - return nil, errors.New(C.GoString(C.sqlite3_errmsg(db))) + if err := conn.loadExtensions(d.Extensions); err != nil { + return nil, err } } -- cgit v1.2.3