diff options
| author | Andrii Zavorotnii <andrii.zavorotnii@gmail.com> | 2019-09-23 14:50:49 -0700 |
|---|---|---|
| committer | Andrii Zavorotnii <andrii.zavorotnii@gmail.com> | 2019-09-23 14:56:04 -0700 |
| commit | c4a8658099ed0e92fabcdcd47331dc6a1cebb1f5 (patch) | |
| tree | 360bcfd97853f87051f3f69caecdd85afd8e5093 | |
| parent | Fix memory leak in ExpandedSQL (#738) (diff) | |
| download | golite-c4a8658099ed0e92fabcdcd47331dc6a1cebb1f5.tar.gz golite-c4a8658099ed0e92fabcdcd47331dc6a1cebb1f5.tar.xz | |
Fix Open() journal mode regression
[why]
see https://github.com/mattn/go-sqlite3/issues/607
SQLite default journal mode is DELETE, but forcing it on open causes "database is locked"
if other connection exists with WAL mode, for example.
[how]
Don't set DELETE mode if not set in DSN explicitly.
[testing]
Run tests in my project where WAL mode is used.
| -rw-r--r-- | sqlite3.go | 11 |
1 files changed, 6 insertions, 5 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 @@ -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 |