From ac279b69bf7c534516ca223de486fd15b273c3a2 Mon Sep 17 00:00:00 2001 From: mattn Date: Fri, 23 Aug 2013 14:26:33 +0900 Subject: [PATCH] Fixes typo --- example/extension/extension.go | 6 +++++- sqlite3.go | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/example/extension/extension.go b/example/extension/extension.go index 95f2f70..d4b8fdb 100644 --- a/example/extension/extension.go +++ b/example/extension/extension.go @@ -8,7 +8,11 @@ import ( ) func main() { - sql.Register("sqlite3_with_extensions", &sqlite3.SQLiteDriver{true, nil}) + sql.Register("sqlite3_with_extensions", + &sqlite3.SQLiteDriver{ + EnableLoadExtension: true, + ConnectHook: nil, + }) db, err := sql.Open("sqlite3_with_extensions", ":memory:") if err != nil { diff --git a/sqlite3.go b/sqlite3.go index a9e3b36..692306d 100644 --- a/sqlite3.go +++ b/sqlite3.go @@ -77,7 +77,7 @@ func init() { // Driver struct. type SQLiteDriver struct { - EnableLoadExtentions bool + EnableLoadExtension bool ConnectHook func(*SQLiteConn) } @@ -130,7 +130,7 @@ func (tx *SQLiteTx) Rollback() error { } func (c *SQLiteConn) AutoCommit() bool { - return int(C.sqlite3_get_autocommit()) != 0 + return int(C.sqlite3_get_autocommit(c.db)) != 0 } func (c *SQLiteConn) exec(cmd string) error { @@ -182,11 +182,11 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { return nil, errors.New(C.GoString(C.sqlite3_errmsg(db))) } - enableLoadExtentions := 0 - if d.EnableLoadExtentions { - enableLoadExtentions = 1 + enableLoadExtension := 0 + if d.EnableLoadExtension { + enableLoadExtension = 1 } - rv = C.sqlite3_enable_load_extension(db, C.int(enableLoadExtentions)) + rv = C.sqlite3_enable_load_extension(db, C.int(enableLoadExtension)) if rv != C.SQLITE_OK { return nil, errors.New(C.GoString(C.sqlite3_errmsg(db))) }