Merge branch 'master' into 12556-oauth-pass-thru

2019-03-13 14:25:43 -04:00
parent de338338bf 4bbd6ab79c
commit 8d19ca005f
1039 changed files with 61350 additions and 17149 deletions
@@ -130,4 +130,7 @@ func addDataSourceMigration(mg *Migrator) {

 	const migrateLoggingToLoki = `UPDATE data_source SET type = 'loki' WHERE type = 'logging'`
 	mg.AddMigration("Migrate logging ds to loki ds", NewRawSqlMigration(migrateLoggingToLoki))
+
+	const setEmptyJSONWhereNullJSON = `UPDATE data_source SET json_data = '{}' WHERE json_data is null`
+	mg.AddMigration("Update json_data with nulls", NewRawSqlMigration(setEmptyJSONWhereNullJSON))
 }