From 17b685396a34cb1fef8439e1b6802c6b7f59fbe2 Mon Sep 17 00:00:00 2001 From: jloup Date: Tue, 1 May 2018 10:16:53 +0200 Subject: Fix PG migrations + redis config. --- db/db.go | 3 ++- db/migrations.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'db') diff --git a/db/db.go b/db/db.go index 078cd58..2596dcb 100644 --- a/db/db.go +++ b/db/db.go @@ -26,6 +26,7 @@ type RedisConfig struct { Type string // tcp or unix Address string Password string + Database int } func Init(config DBConfig, redisConfig RedisConfig) { @@ -42,7 +43,7 @@ func Init(config DBConfig, redisConfig RedisConfig) { Network: redisConfig.Type, Addr: redisConfig.Address, Password: redisConfig.Password, - DB: 0, + DB: redisConfig.Database, }) _, err = Redis.Ping().Result() diff --git a/db/migrations.go b/db/migrations.go index 286fe17..38ea8aa 100644 --- a/db/migrations.go +++ b/db/migrations.go @@ -26,22 +26,22 @@ var migrations []Migration = []Migration{ config jsonb, UNIQUE(user_id, market_name) )`, + `CREATE TABLE reports ( + id BIGSERIAL PRIMARY KEY, + date timestamp with time zone NOT NULL, + market_config_id bigint NOT NULL, + debug boolean + )`, + "CREATE INDEX IF NOT EXISTS reports_market_config_id ON reports (market_config_id)", `CREATE TABLE report_lines ( id BIGSERIAL PRIMARY KEY, date timestamp with time zone NOT NULL, - report_id bigint NOT NULL, + report_id bigint NOT NULL REFERENCES reports(id), type text, payload jsonb )`, "CREATE INDEX IF NOT EXISTS report_lines_report_id ON report_lines (report_id)", "CREATE INDEX IF NOT EXISTS report_lines_type ON report_lines (type)", - `CREATE TABLE reports ( - id BIGSERIAL PRIMARY KEY, - date timestamp with time zone NOT NULL, - market_config_id bigint NOT NULL, - debug boolean - )`, - "CREATE INDEX IF NOT EXISTS reports_market_config_id ON reports (market_config_id)", }, Down: []string{"DROP TABLE users", "DROP TABLE market_configs", "DROP TABLE report_lines", "DROP TABLE reports"}, }, -- cgit v1.2.3