diff options
author | Jessica Frazelle <acidburn@docker.com> | 2015-09-04 11:16:27 -0700 |
---|---|---|
committer | Jessica Frazelle <acidburn@docker.com> | 2015-09-04 14:46:16 -0700 |
commit | e37121d4ea9b7f071a2ae681dd64b4fdfcda0987 (patch) | |
tree | d47cdd208b7f9f7c76c5a8b49f58f0d21edd4b8d | |
parent | Merge pull request #231 from marccampbell/master (diff) | |
download | golite-e37121d4ea9b7f071a2ae681dd64b4fdfcda0987.tar.gz golite-e37121d4ea9b7f071a2ae681dd64b4fdfcda0987.tar.xz |
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 <acidburn@docker.com>
-rw-r--r-- | sqlite3.go | 19 | ||||
-rw-r--r-- | sqlite3_load_extension.go | 39 | ||||
-rw-r--r-- | sqlite3_omit_load_extension.go | 19 |
3 files changed, 60 insertions, 17 deletions
@@ -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 } } diff --git a/sqlite3_load_extension.go b/sqlite3_load_extension.go new file mode 100644 index 0000000..0251016 --- /dev/null +++ b/sqlite3_load_extension.go @@ -0,0 +1,39 @@ +// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>. +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. +// +build !sqlite_omit_load_extension + +package sqlite3 + +/* +#include <sqlite3-binding.h> +#include <stdlib.h> +*/ +import "C" +import ( + "errors" + "unsafe" +) + +func (c *SQLiteConn) loadExtensions(extensions []string) error { + rv := C.sqlite3_enable_load_extension(c.db, 1) + if rv != C.SQLITE_OK { + return errors.New(C.GoString(C.sqlite3_errmsg(c.db))) + } + + for _, extension := range extensions { + cext := C.CString(extension) + defer C.free(unsafe.Pointer(cext)) + rv = C.sqlite3_load_extension(c.db, cext, nil, nil) + if rv != C.SQLITE_OK { + return errors.New(C.GoString(C.sqlite3_errmsg(c.db))) + } + } + + rv = C.sqlite3_enable_load_extension(c.db, 0) + if rv != C.SQLITE_OK { + return errors.New(C.GoString(C.sqlite3_errmsg(c.db))) + } + return nil +} diff --git a/sqlite3_omit_load_extension.go b/sqlite3_omit_load_extension.go new file mode 100644 index 0000000..a80cf87 --- /dev/null +++ b/sqlite3_omit_load_extension.go @@ -0,0 +1,19 @@ +// Copyright (C) 2014 Yasuhiro Matsumoto <mattn.jp@gmail.com>. +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. +// +build sqlite_omit_load_extension + +package sqlite3 + +/* +#cgo CFLAGS: -DSQLITE_OMIT_LOAD_EXTENSION +*/ +import "C" +import ( + "errors" +) + +func (c *SQLiteConn) loadExtensions(extensions []string) error { + return errors.New("Extensions have been disabled for static builds") +} |