diff options
| author | mattn <mattn.jp@gmail.com> | 2019-09-24 10:39:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 10:39:45 +0900 |
| commit | 4396a38886da660e403409e35ef4a37906bf0975 (patch) | |
| tree | 69beb9821c98fbf2c19a5b8b2727a5696effd176 | |
| parent | Fix memory leak in ExpandedSQL (#738) (diff) | |
| parent | Fix typo in "_locking_mode" DSN handling (diff) | |
| download | golite-4396a38886da660e403409e35ef4a37906bf0975.tar.gz golite-4396a38886da660e403409e35ef4a37906bf0975.tar.xz | |
Merge pull request #747 from azavorotnii/open_journal_mode
Fix Open() journal mode regression
| -rw-r--r-- | sqlite3.go | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1000,7 +1000,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { deferForeignKeys := -1 foreignKeys := -1 ignoreCheckConstraints := -1 - journalMode := "DELETE" + var journalMode string lockingMode := "NORMAL" queryOnly := -1 recursiveTriggers := -1 @@ -1232,7 +1232,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { if _, ok := params["_locking"]; ok { pkey = "_locking" } - if val := params.Get("_locking"); val != "" { + if val := params.Get(pkey); val != "" { switch strings.ToUpper(val) { case "NORMAL", "EXCLUSIVE": lockingMode = strings.ToUpper(val) @@ -1571,10 +1571,11 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) { } // Journal Mode - // Because default Journal Mode is DELETE this PRAGMA can always be executed. - if err := exec(fmt.Sprintf("PRAGMA journal_mode = %s;", journalMode)); err != nil { - C.sqlite3_close_v2(db) - return nil, err + if journalMode != "" { + if err := exec(fmt.Sprintf("PRAGMA journal_mode = %s;", journalMode)); err != nil { + C.sqlite3_close_v2(db) + return nil, err + } } // Locking Mode |