From e265765c75c44b9aa27ab3fa442d82223b693529 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Thu, 14 Jun 2018 08:24:58 -0700 Subject: [PATCH] upgrades - plugins --- .travis.yml | 1 + database.go | 22 +++++++++++++++++++--- main.go | 2 +- setup.go | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14ce0020..d7ab77ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ before_install: - if [[ "$TRAVIS_BRANCH" == "master" ]]; then travis_wait 30 docker pull karalabe/xgo-latest; fi before_script: + - psql -c 'create database travis_ci_test;' -U postgres - go get github.com/stretchr/testify/assert - go get golang.org/x/tools/cmd/cover - go get github.com/rendon/testcli diff --git a/database.go b/database.go index d5f28ae9..3ad42558 100644 --- a/database.go +++ b/database.go @@ -5,17 +5,33 @@ import ( "fmt" "github.com/hunterlong/statup/plugin" _ "github.com/lib/pq" + _ "github.com/mattn/go-sqlite3" + _ "github.com/go-sql-driver/mysql" "math/rand" "time" ) -func DbConnection() error { +func DbConnection(dbType string) error { var err error - dbinfo := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=disable", configs.Host, configs.Port, configs.User, configs.Password, configs.Database) - db, err = sql.Open("postgres", dbinfo) + var dbInfo string + if dbType=="sqlite3" { + dbInfo = "./statup.db" + } else if dbType=="mysql" { + dbInfo = fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=utf8", configs.User, configs.Password, configs.Host, configs.Port, configs.Database) + } else { + dbInfo = fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=disable", configs.Host, configs.Port, configs.User, configs.Password, configs.Database) + } + db, err = sql.Open(dbType, dbInfo) if err != nil { return err } + + //stmt, err := db.Prepare("CREATE database statup;") + //if err != nil { + // panic(err) + //} + //stmt.Exec() + plugin.SetDatabase(db) return err } diff --git a/main.go b/main.go index 427e723c..cf18759f 100644 --- a/main.go +++ b/main.go @@ -247,7 +247,7 @@ func main() { func mainProcess() { var err error - err = DbConnection() + err = DbConnection(configs.Connection) if err != nil { throw(err) } diff --git a/setup.go b/setup.go index 1e124899..c17343dd 100644 --- a/setup.go +++ b/setup.go @@ -73,7 +73,7 @@ func (c *DbConfig) Save() error { if err != nil { return err } - err = DbConnection() + err = DbConnection(configs.Connection) if err != nil { return err }