aboutsummaryrefslogtreecommitdiff
path: root/sqlite3.go
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2015-09-05 23:49:54 +0900
committermattn <mattn.jp@gmail.com>2015-09-05 23:49:54 +0900
commit3b3f1d01b2696af5501697c35629048c227586ab (patch)
treed47cdd208b7f9f7c76c5a8b49f58f0d21edd4b8d /sqlite3.go
parentMerge pull request #231 from marccampbell/master (diff)
parentintroduce ability to pass sqlite_omit_load_extension (diff)
downloadgolite-3b3f1d01b2696af5501697c35629048c227586ab.tar.gz
golite-3b3f1d01b2696af5501697c35629048c227586ab.tar.xz
Merge pull request #235 from jfrazelle/static_remove_dlopen
remove dlopen if static_build flag
Diffstat (limited to 'sqlite3.go')
-rw-r--r--sqlite3.go19
1 files changed, 2 insertions, 17 deletions
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
}
}