re
/
go-sqlite3
forked from mirror/go-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Config 

* Update tests
* Increase coverage
This commit is contained in:
Gert-Jan Timmer 2018-06-24 23:38:33 +02:00
parent 7c7d9c8ce5
commit f5c3c6f922
2 changed files with 141 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
driver/config.go
View File

@ -576,12 +576,8 @@ type Auth struct {
// NewConfig creates a new Config and sets default values.
func NewConfig() *Config {
return &Config{
// This is the behavior that is always used
// for sqlite3_open() and sqlite3_open16().
// This is way it is set as default.
Mode: ModeReadWriteCreate,
Database: ":memory:",
Mode: ModeReadWriteCreate,
Cache: CacheModePrivate,
Immutable: false,
Mutex: MutexFull,
@ -610,9 +606,17 @@ func (cfg *Config) FormatDSN() string {
var buf bytes.Buffer
params := url.Values{}
params.Set("mode", cfg.Mode.String())
params.Set("cache", cfg.Cache.String())
params.Set("mutex", cfg.Mutex.String())
if len(cfg.Cache.String()) > 0 {
params.Set("cache", cfg.Cache.String())
}
if len(cfg.Mode.String()) > 0 {
params.Set("mode", cfg.Mode.String())
}
if len(cfg.Mutex.String()) > 0 {
params.Set("mutex", cfg.Mutex.String())
}
if cfg.Immutable {
params.Set("immutable", "true")
@ -626,15 +630,15 @@ func (cfg *Config) FormatDSN() string {
}
}
if cfg.TransactionLock != TxLockDeferred {
if len(cfg.TransactionLock.String()) > 0 && cfg.TransactionLock != TxLockDeferred {
params.Set("txlock", cfg.TransactionLock.String())
}
if cfg.LockingMode != LockingModeNormal {
if len(cfg.LockingMode) > 0 && cfg.LockingMode != LockingModeNormal {
params.Set("lock", cfg.LockingMode.String())
}
if cfg.AutoVacuum != AutoVacuumNone {
if len(cfg.AutoVacuum) > 0 && cfg.AutoVacuum != AutoVacuumNone {
params.Set("vacuum", cfg.AutoVacuum.String())
}
@ -654,7 +658,7 @@ func (cfg *Config) FormatDSN() string {
params.Set("ignore_check_contraints", "true")
}
if cfg.JournalMode != JournalModeDelete {
if len(cfg.JournalMode) > 0 && cfg.JournalMode != JournalModeDelete {
params.Set("journal", cfg.JournalMode.String())
}
@ -666,28 +670,30 @@ func (cfg *Config) FormatDSN() string {
params.Set("recursive_triggers", "true")
}
if cfg.SecureDelete != SecureDeleteOff {
if len(cfg.SecureDelete) > 0 && cfg.SecureDelete != SecureDeleteOff {
params.Set("secure_delete", cfg.SecureDelete.String())
}
if cfg.Synchronous != SynchronousNormal {
params.Set("syn", cfg.Synchronous.String())
if len(cfg.Synchronous) > 0 && cfg.Synchronous != SynchronousNormal {
params.Set("sync", cfg.Synchronous.String())
}
if cfg.WriteableSchema {
params.Set("writable_schema", "true")
}
if len(cfg.Authentication.Username) > 0 && len(cfg.Authentication.Password) > 0 {
params.Set("user", cfg.Authentication.Username)
params.Set("pass", cfg.Authentication.Password)
if cfg.Authentication != nil {
if len(cfg.Authentication.Username) > 0 && len(cfg.Authentication.Password) > 0 {
params.Set("user", cfg.Authentication.Username)
params.Set("pass", cfg.Authentication.Password)
if len(cfg.Authentication.Salt) > 0 {
params.Set("salt", cfg.Authentication.Salt)
}
if len(cfg.Authentication.Salt) > 0 {
params.Set("salt", cfg.Authentication.Salt)
}
if cfg.Authentication.Encoder != nil {
params.Set("crypt", cfg.Authentication.Encoder.String())
if cfg.Authentication.Encoder != nil {
params.Set("crypt", cfg.Authentication.Encoder.String())
}
}
}
@ -697,8 +703,10 @@ func (cfg *Config) FormatDSN() string {
buf.WriteString(cfg.Database)
// Append Options
buf.WriteRune('?')
buf.WriteString(params.Encode())
if len(params) > 0 {
buf.WriteRune('?')
buf.WriteString(params.Encode())
}
return buf.String()
}

111
driver/config_test.go
View File

@ -621,7 +621,112 @@ func TestParseDSN(t *testing.T) {
}
func TestFormatDSN(t *testing.T) {
// TODO: TestFormatDSN
cfg := NewConfig()
cfg.FormatDSN()
ams, _ := time.LoadLocation("Europe/Amsterdam")
cases := map[string]*Config{
"file::memory:?cache=private&mode=rwc&mutex=full": NewConfig(),
"file:test.db?mode=ro&mutex=no": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexNo,
},
"file:test.db": &Config{
Database: "test.db",
},
"file:test.db?cache=private&cslike=true&defer_fk=true&fk=true&ignore_check_contraints=true&immutable=true&mode=ro&mutex=full&query_only=true&recursive_triggers=true&writable_schema=true": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
Immutable: true,
CaseSensitiveLike: true,
DeferForeignKeys: true,
ForeignKeyConstraints: true,
IgnoreCheckConstraints: true,
QueryOnly: true,
RecursiveTriggers: true,
WriteableSchema: true,
},
"file:test.db?cache=shared&mode=rw&mutex=full&tz=auto": &Config{
Database: "test.db",
Mode: ModeReadWrite,
Mutex: MutexFull,
Cache: CacheModeShared,
TimeZone: time.Local,
},
"file::memory:?cache=private&mode=memory&mutex=full&tz=Europe%2FAmsterdam": &Config{
Database: ":memory:",
Mode: ModeMemory,
Mutex: MutexFull,
Cache: CacheModePrivate,
TimeZone: ams,
},
"file:test.db?cache=private&mode=ro&mutex=full&txlock=immediate": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
TransactionLock: TxLockImmediate,
},
"file:test.db?cache=private&mode=ro&mutex=full&txlock=exclusive": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
TransactionLock: TxLockExclusive,
},
"file:test.db?cache=private&lock=exclusive&mode=ro&mutex=full": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
LockingMode: LockingModeExclusive,
},
"file:test.db?cache=private&mode=ro&mutex=full&vacuum=full": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
AutoVacuum: AutoVacuumFull,
},
"file:test.db?cache=private&journal=wal&mode=ro&mutex=full": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
JournalMode: JournalModeWAL,
},
"file:test.db?cache=private&mode=ro&mutex=full&secure_delete=fast": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
SecureDelete: SecureDeleteFast,
},
"file:test.db?cache=private&mode=ro&mutex=full&sync=extra": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
Synchronous: SynchronousExtra,
},
"file:test.db?cache=private&crypt=sha1&mode=ro&mutex=full&pass=admin&salt=salt&user=admin": &Config{
Database: "test.db",
Mode: ModeReadOnly,
Mutex: MutexFull,
Cache: CacheModePrivate,
Authentication: &Auth{
Username: "admin",
Password: "admin",
Salt: "salt",
Encoder: NewSHA1Encoder(),
},
},
}
for dsn, cfg := range cases {
if cfg.FormatDSN() != dsn {
t.Fatalf("Failed to format DSN; expected: %s, got: %s", dsn, cfg.FormatDSN())
}
}
}