From 563d5e3ad86435e58968d6d00d4a1b7d0038ec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 25 Feb 2015 07:57:51 +0100 Subject: [PATCH] All migrations work in sqlite3, mysql and postgres --- .gitignore | 1 + docker/fig.yml | 7 ------- pkg/services/sqlstore/migrations/user_mig.go | 2 +- pkg/services/sqlstore/migrator/migrator.go | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 docker/fig.yml diff --git a/.gitignore b/.gitignore index 8db10c0ca39..c1491666d88 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ src/css/*.min.css /grafana grafana.custom.ini +fig.yml diff --git a/docker/fig.yml b/docker/fig.yml deleted file mode 100644 index 81a6e9c6fc8..00000000000 --- a/docker/fig.yml +++ /dev/null @@ -1,7 +0,0 @@ -influxdb: - build: blocks/influxdb - ports: - - "2004:2004" - - "8083:8083" - - "8086:8086" - diff --git a/pkg/services/sqlstore/migrations/user_mig.go b/pkg/services/sqlstore/migrations/user_mig.go index be8b6760d61..d2672917e20 100644 --- a/pkg/services/sqlstore/migrations/user_mig.go +++ b/pkg/services/sqlstore/migrations/user_mig.go @@ -57,7 +57,7 @@ func addUserMigrations(mg *Migrator) { &Column{Name: "org_id", Type: DB_BigInt, Nullable: false}, &Column{Name: "is_admin", Type: DB_Bool, Nullable: false}, &Column{Name: "email_verified", Type: DB_Bool, Nullable: true}, - &Column{Name: "theme", Type: DB_NVarchar, Nullable: true}, + &Column{Name: "theme", Type: DB_NVarchar, Length: 255, Nullable: true}, &Column{Name: "created", Type: DB_DateTime, Nullable: false}, &Column{Name: "updated", Type: DB_DateTime, Nullable: false}, }, diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go index 7407b7cd1e3..2461d9dab0c 100644 --- a/pkg/services/sqlstore/migrator/migrator.go +++ b/pkg/services/sqlstore/migrator/migrator.go @@ -125,7 +125,7 @@ func (mg *Migrator) exec(m Migration) error { results, err := sess.Query(sql, args...) if err != nil || len(results) == 0 { log.Info("Migrator: skipping migration id: %v, condition not fulfilled", m.Id()) - return nil + return sess.Rollback() } }