From 10949a9ba3c2035ee06ac0213efa76a9d6d316da Mon Sep 17 00:00:00 2001 From: Chakib Benziane Date: Wed, 27 Mar 2019 10:57:01 +0100 Subject: [PATCH] wip postgres --- db/db.go | 7 ++++--- docker-compose.yml | 13 +++++++++++++ go.mod | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/db/db.go b/db/db.go index 143acd5..6a83e7a 100644 --- a/db/db.go +++ b/db/db.go @@ -5,7 +5,8 @@ import ( "log" "os" - _ "github.com/go-sql-driver/mysql" + _ "github.com/lib/pq" + //_ "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" "github.com/mediocregopher/radix/v3" ) @@ -47,11 +48,11 @@ func (d *Database) Open() error { log.Fatal("undefined DB_PASS env") } - dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s", user, pass, host, DBName) + dsn := fmt.Sprintf("%s:%s@%s/%s", user, pass, host, DBName) log.Printf("Opening SQL at %s\n", dsn) - d.Sql = sqlx.MustConnect("mysql", dsn) + d.Sql = sqlx.MustConnect("postgres", dsn) // Execute Pragmas //d.Sql.MustExec(DBPragma) diff --git a/docker-compose.yml b/docker-compose.yml index 61e8092..1c64817 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ version: "3.4" volumes: db: maria-conf: + postgresql: file-storage: #sqlite: gocache: @@ -46,6 +47,18 @@ services: volumes: - db:/var/lib/mysql - maria-conf:/etc/mysql + postgres: + image: postgres:11.2 + environment: + - POSTGRES_PASSWORD=bit4sat + - POSTGRES_USER=bit4sat + - POSTGRES_DB=bit4sat + + volumes: + - postgresql:/var/lib/postgresql/data + + + redis: image: redis:alpine diff --git a/go.mod b/go.mod index cbacc37..098cdb7 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/golang/protobuf v1.3.1 // indirect github.com/jmoiron/sqlx v1.2.0 github.com/kr/pretty v0.1.0 // indirect + github.com/lib/pq v1.0.0 github.com/mattn/go-isatty v0.0.7 // indirect github.com/mattn/go-sqlite3 v1.10.0 github.com/mediocregopher/radix/v3 v3.2.3