Merge branch 'master' into apps

Conflicts: pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
parent aa32459bc2 8a2af9b818
commit 69d0e82453
20 changed files with 205 additions and 63 deletions
@@ -19,6 +19,7 @@ func AddMigrations(mg *Migrator) {
 	addDashboardSnapshotMigrations(mg)
 	addQuotaMigration(mg)
 	addAppPluginMigration(mg)
+	addSessionMigration(mg)
 }

 func addMigrationLogMigrations(mg *Migrator) {
@@ -0,0 +1,16 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addSessionMigration(mg *Migrator) {
+	var sessionV1 = Table{
+		Name: "session",
+		Columns: []*Column{
+			{Name: "key", Type: DB_Char, IsPrimaryKey: true, Length: 16},
+			{Name: "data", Type: DB_Blob},
+			{Name: "expiry", Type: DB_Integer, Length: 255, Nullable: false},
+		},
+	}
+
+	mg.AddMigration("create session table", NewAddTableMigration(sessionV1))
+}