Merge branch 'master' of github.com:30x/apid-core into APIRT-4751
diff --git a/data/data.go b/data/data.go index d5c893c..d9d1404 100644 --- a/data/data.go +++ b/data/data.go
@@ -38,7 +38,7 @@ statCollectionInterval = 10 commonDBID = "common" commonDBVersion = "base" - + dbOpenMode = "?cache=shared&mode=rwc" defaultTraceLevel = "warn" ) @@ -155,7 +155,7 @@ log.Infof("LoadDB: %s", dataPath) source := fmt.Sprintf(config.GetString(configDataSourceKey), dataPath) - + source += dbOpenMode wrappedDriverName := "dd:" + config.GetString(configDataDriverKey) driver := wrap.NewDriver(&sqlite3.SQLiteDriver{}, dbTraceLog) func() {
diff --git a/data/data_test.go b/data/data_test.go index 26dd52e..b4d20ae 100644 --- a/data/data_test.go +++ b/data/data_test.go
@@ -28,7 +28,7 @@ ) const ( - count = 2000 + count = 5000 setupSql = ` CREATE TABLE test_1 (id INTEGER PRIMARY KEY, counter TEXT); CREATE TABLE test_2 (id INTEGER PRIMARY KEY, counter TEXT);` @@ -150,6 +150,8 @@ } func write(db apid.DB, i int) { + + // DB INSERT as a txn tx, err := db.Begin() defer tx.Rollback() if err != nil { @@ -162,5 +164,7 @@ } prep.Close() tx.Commit() + // DB INSERT directly, not via a txn + db.Exec("INSERT INTO test_1 (counter) VALUES ($?)", i + 10000) fmt.Print("+") }