IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(mysql): fix for migration in newly added temp_user table, fixes #2509

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-14 09:40:53 +02:00
parent 2f849be9d8
commit 16fa5c4df3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/migrations/temp_user.go
View File

@@ -17,7 +17,7 @@ func addTempUserMigrations(mg *Migrator) {
{Name: "invited_by_user_id", Type: DB_BigInt, Nullable: true},
{Name: "email_sent", Type: DB_Bool},
{Name: "email_sent_on", Type: DB_DateTime, Nullable: true},
{Name: "remote_addr", Type: DB_Varchar, Nullable: true},
{Name: "remote_addr", Type: DB_Varchar, Length: 255, Nullable: true},
{Name: "created", Type: DB_DateTime},
{Name: "updated", Type: DB_DateTime},
},

1
pkg/services/sqlstore/migrator/migrator.go
View File

@@ -100,6 +100,7 @@ func (mg *Migrator) Start() error {
}
if err := mg.exec(m); err != nil {
log.Error(3, "Migrator: error: \n%s:\n%s", err, sql)
record.Error = err.Error()
mg.x.Insert(&record)
return err