From 8ee2a314ceebb9de2d73c5e5d11b9b8606d0e9b4 Mon Sep 17 00:00:00 2001 From: NatureFreshMilk Date: Fri, 25 Jan 2019 10:19:30 +0100 Subject: [PATCH] code cleanup --- server/mapobjectdb/sqlite_new.go | 20 ++++++++++++++++++++ server/mapobjectdb/sqlite_tiles.go | 15 --------------- 2 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 server/mapobjectdb/sqlite_new.go diff --git a/server/mapobjectdb/sqlite_new.go b/server/mapobjectdb/sqlite_new.go new file mode 100644 index 0000000..b5b72ed --- /dev/null +++ b/server/mapobjectdb/sqlite_new.go @@ -0,0 +1,20 @@ +package mapobjectdb + +import ( + "database/sql" + _ "github.com/mattn/go-sqlite3" +) + + +func NewSqliteAccessor(filename string) (*Sqlite3Accessor, error) { + //TODO: flag/config for unsafe db access + db, err := sql.Open("sqlite3", filename+"?_timeout=500&_journal_mode=MEMORY&_synchronous=OFF") + db.SetMaxOpenConns(1) + + if err != nil { + return nil, err + } + + sq := &Sqlite3Accessor{db: db, filename: filename} + return sq, nil +} diff --git a/server/mapobjectdb/sqlite_tiles.go b/server/mapobjectdb/sqlite_tiles.go index 3066475..f8d8d87 100644 --- a/server/mapobjectdb/sqlite_tiles.go +++ b/server/mapobjectdb/sqlite_tiles.go @@ -1,8 +1,6 @@ package mapobjectdb import ( - "database/sql" - _ "github.com/mattn/go-sqlite3" "mapserver/coords" ) @@ -66,16 +64,3 @@ func (db *Sqlite3Accessor) RemoveTile(pos *coords.TileCoords) error { _, err := db.db.Exec(removeTileQuery, pos.X, pos.Y, pos.Zoom, pos.LayerId) return err } - -func NewSqliteAccessor(filename string) (*Sqlite3Accessor, error) { - //TODO: flag/config for unsafe db access - db, err := sql.Open("sqlite3", filename+"?_timeout=500&_journal_mode=MEMORY&_synchronous=OFF") - db.SetMaxOpenConns(1) - - if err != nil { - return nil, err - } - - sq := &Sqlite3Accessor{db: db, filename: filename} - return sq, nil -}