Progress on database schema migration for account -> org refactor

pkg/services/sqlstore/migrations.go

@@ -1,184 +0,0 @@
-package sqlstore
-
-import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
-
-// --- Migration Guide line ---
-// 1. Never change a migration that is committed and pushed to master
-// 2. Always add new migrations (to change or undo previous migrations)
-// 3. Some migraitons are not yet written (rename column, table, drop table, index etc)
-
-func addMigrations(mg *Migrator) {
-	addMigrationLogMigrations(mg)
-	addUserMigrations(mg)
-	addStarMigrations(mg)
-	addAccountMigrations(mg)
-	addDashboardMigration(mg)
-	addDataSourceMigration(mg)
-	addApiKeyMigrations(mg)
-}
-
-func addMigrationLogMigrations(mg *Migrator) {
-	mg.AddMigration("create migration_log table", new(AddTableMigration).
-		Name("migration_log").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "migration_id", Type: DB_NVarchar, Length: 255},
-		&Column{Name: "sql", Type: DB_Text},
-		&Column{Name: "success", Type: DB_Bool},
-		&Column{Name: "error", Type: DB_Text},
-		&Column{Name: "timestamp", Type: DB_DateTime},
-	))
-}
-
-func addUserMigrations(mg *Migrator) {
-	mg.AddMigration("create user table", new(AddTableMigration).
-		Name("user").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "version", Type: DB_Int, Nullable: false},
-		&Column{Name: "login", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "email", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
-		&Column{Name: "rands", Type: DB_NVarchar, Length: 50, Nullable: true},
-		&Column{Name: "company", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "is_admin", Type: DB_Bool, Nullable: false},
-		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
-		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
-	))
-
-	mg.AddMigration("Add email_verified flag", new(AddColumnMigration).
-		Table("user").Column(&Column{Name: "email_verified", Type: DB_Bool, Nullable: true}))
-
-	mg.AddMigration("Add user.theme column", new(AddColumnMigration).
-		Table("user").Column(&Column{Name: "theme", Type: DB_Varchar, Nullable: true, Length: 20}))
-
-	//-------  user table indexes ------------------
-	mg.AddMigration("add unique index user.login", new(AddIndexMigration).
-		Table("user").Columns("login").Unique())
-	mg.AddMigration("add unique index user.email", new(AddIndexMigration).
-		Table("user").Columns("email").Unique())
-}
-
-func addStarMigrations(mg *Migrator) {
-	mg.AddMigration("create star table", new(AddTableMigration).
-		Name("star").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "user_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "dashboard_id", Type: DB_BigInt, Nullable: false},
-	))
-
-	mg.AddMigration("add unique index star.user_id_dashboard_id", new(AddIndexMigration).
-		Table("star").Columns("user_id", "dashboard_id").Unique())
-}
-
-func addAccountMigrations(mg *Migrator) {
-	mg.AddMigration("create account table", new(AddTableMigration).
-		Name("account").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "version", Type: DB_Int, Nullable: false},
-		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
-		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
-	))
-
-	mg.AddMigration("add unique index account.name", new(AddIndexMigration).
-		Table("account").Columns("name").Unique())
-
-	//-------  account_user table -------------------
-	mg.AddMigration("create account_user table", new(AddTableMigration).
-		Name("account_user").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "account_id", Type: DB_BigInt},
-		&Column{Name: "user_id", Type: DB_BigInt},
-		&Column{Name: "role", Type: DB_NVarchar, Length: 20},
-		&Column{Name: "created", Type: DB_DateTime},
-		&Column{Name: "updated", Type: DB_DateTime},
-	))
-
-	mg.AddMigration("add unique index account_user_aid_uid", new(AddIndexMigration).
-		Name("aid_uid").Table("account_user").Columns("account_id", "user_id").Unique())
-}
-
-func addDashboardMigration(mg *Migrator) {
-	mg.AddMigration("create dashboard table", new(AddTableMigration).
-		Name("dashboard").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "version", Type: DB_Int, Nullable: false},
-		&Column{Name: "slug", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "data", Type: DB_Text, Nullable: false},
-		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
-		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
-	))
-
-	mg.AddMigration("create dashboard_tag table", new(AddTableMigration).
-		Name("dashboard_tag").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "dashboard_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "term", Type: DB_NVarchar, Length: 50, Nullable: false},
-	))
-
-	//-------  indexes ------------------
-	mg.AddMigration("add index dashboard.account_id", new(AddIndexMigration).
-		Table("dashboard").Columns("account_id"))
-
-	mg.AddMigration("add unique index dashboard_account_id_slug", new(AddIndexMigration).
-		Table("dashboard").Columns("account_id", "slug").Unique())
-
-	mg.AddMigration("add unique index dashboard_tag.dasboard_id_term", new(AddIndexMigration).
-		Table("dashboard_tag").Columns("dashboard_id", "term").Unique())
-}
-
-func addDataSourceMigration(mg *Migrator) {
-	mg.AddMigration("create data_source table", new(AddTableMigration).
-		Name("data_source").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "version", Type: DB_Int, Nullable: false},
-		&Column{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "user", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "database", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "basic_auth", Type: DB_Bool, Nullable: false},
-		&Column{Name: "basic_auth_user", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "basic_auth_password", Type: DB_NVarchar, Length: 255, Nullable: true},
-		&Column{Name: "is_default", Type: DB_Bool, Nullable: false},
-		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
-		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
-	))
-
-	//-------  indexes ------------------
-	mg.AddMigration("add index data_source.account_id", new(AddIndexMigration).
-		Table("data_source").Columns("account_id"))
-
-	mg.AddMigration("add unique index data_source.account_id_name", new(AddIndexMigration).
-		Table("data_source").Columns("account_id", "name").Unique())
-}
-
-func addApiKeyMigrations(mg *Migrator) {
-	mg.AddMigration("create api_key table", new(AddTableMigration).
-		Name("api_key").WithColumns(
-		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
-		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
-		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "key", Type: DB_Varchar, Length: 64, Nullable: false},
-		&Column{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
-		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
-		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
-	))
-
-	//-------  indexes ------------------
-	mg.AddMigration("add index api_key.account_id", new(AddIndexMigration).
-		Table("api_key").Columns("account_id"))
-
-	mg.AddMigration("add index api_key.key", new(AddIndexMigration).
-		Table("api_key").Columns("key").Unique())
-
-	mg.AddMigration("add index api_key.account_id_name", new(AddIndexMigration).
-		Table("api_key").Columns("account_id", "name").Unique())
-}

pkg/services/sqlstore/migrations/apikey_mig.go

@@ -0,0 +1,72 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addApiKeyMigrations(mg *Migrator) {
+	mg.AddMigration("create api_key table", new(AddTableMigration).
+		Name("api_key").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "key", Type: DB_Varchar, Length: 64, Nullable: false},
+		&Column{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//-------  indexes ------------------
+	mg.AddMigration("add index api_key.account_id", new(AddIndexMigration).
+		Table("api_key").Columns("account_id"))
+
+	mg.AddMigration("add index api_key.key", new(AddIndexMigration).
+		Table("api_key").Columns("key").Unique())
+
+	mg.AddMigration("add index api_key.account_id_name", new(AddIndexMigration).
+		Table("api_key").Columns("account_id", "name").Unique())
+
+	// ---------------------
+	// account -> org changes
+
+	//-------  drop indexes ------------------
+	mg.AddMigration("drop index api_key.account_id", new(DropIndexMigration).
+		Table("api_key").Columns("account_id"))
+
+	mg.AddMigration("drop index api_key.key", new(DropIndexMigration).
+		Table("api_key").Columns("key").Unique())
+
+	mg.AddMigration("drop index api_key.account_id_name", new(DropIndexMigration).
+		Table("api_key").Columns("account_id", "name").Unique())
+
+	//------- rename table ------------------
+	mg.AddMigration("rename table api_key to api_key_old", new(RenameTableMigration).
+		Rename("api_key", "api_key_old"))
+
+	//------- recreate table with new column names ------------------
+	mg.AddMigration("create api_key table v2", new(AddTableMigration).
+		Name("api_key").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "org_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "key", Type: DB_Varchar, Length: 64, Nullable: false},
+		&Column{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//------- recreate indexes ------------------
+	mg.AddMigration("add index api_key.org_id", new(AddIndexMigration).
+		Table("api_key").Columns("org_id"))
+
+	mg.AddMigration("add index api_key.key v2", new(AddIndexMigration).
+		Table("api_key").Columns("key").Unique())
+
+	mg.AddMigration("add index api_key.org_id_name", new(AddIndexMigration).
+		Table("api_key").Columns("org_id", "name").Unique())
+
+	//------- copy data from old api_key_old -------------------
+	mg.AddMigration("copy data from old api_key table", new(CopyTableDataMigration).
+		Source("api_key_old", "id, account_id, name, key, role, created, updated").
+		Target("api_key", "id, org_id, name, key, role, created, updated"))
+
+	mg.AddMigration("Drop old table api_key_old", new(DropTableMigration).Table("api_key_old"))
+}

pkg/services/sqlstore/migrations/dashboard_mig.go

@@ -0,0 +1,81 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addDashboardMigration(mg *Migrator) {
+	mg.AddMigration("create dashboard table", new(AddTableMigration).
+		Name("dashboard").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "slug", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "data", Type: DB_Text, Nullable: false},
+		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	mg.AddMigration("create dashboard_tag table", new(AddTableMigration).
+		Name("dashboard_tag").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "dashboard_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "term", Type: DB_NVarchar, Length: 50, Nullable: false},
+	))
+
+	//-------  indexes ------------------
+	mg.AddMigration("add index dashboard.account_id", new(AddIndexMigration).
+		Table("dashboard").Columns("account_id"))
+
+	mg.AddMigration("add unique index dashboard_account_id_slug", new(AddIndexMigration).
+		Table("dashboard").Columns("account_id", "slug").Unique())
+
+	mg.AddMigration("add unique index dashboard_tag.dasboard_id_term", new(AddIndexMigration).
+		Table("dashboard_tag").Columns("dashboard_id", "term").Unique())
+
+	// ---------------------
+	// account -> org changes
+
+	//-------  drop indexes ------------------
+	mg.AddMigration("drop index dashboard.account_id", new(DropIndexMigration).
+		Table("dashboard").Columns("account_id"))
+
+	mg.AddMigration("drop unique index dashboard_account_id_slug", new(DropIndexMigration).
+		Table("dashboard").Columns("account_id", "slug").Unique())
+
+	mg.AddMigration("drop unique index dashboard_tag.dasboard_id_term", new(DropIndexMigration).
+		Table("dashboard_tag").Columns("dashboard_id", "term").Unique())
+
+	//------- rename table ------------------
+	mg.AddMigration("rename table dashboard to dashboard_old", new(RenameTableMigration).
+		Rename("dashboard", "dashboard_old"))
+
+	//------- recreate table with new column names ------------------
+	mg.AddMigration("create dashboard table v2", new(AddTableMigration).
+		Name("dashboard").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "slug", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "data", Type: DB_Text, Nullable: false},
+		&Column{Name: "org_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//-------  dashboard table indexes ------------------
+	mg.AddMigration("add index dashboard.org_id", new(AddIndexMigration).
+		Table("dashboard").Columns("org_id"))
+
+	mg.AddMigration("add unique index dashboard_org_id_slug", new(AddIndexMigration).
+		Table("dashboard").Columns("org_id", "slug").Unique())
+
+	mg.AddMigration("add unique index dashboard_tag.dasboard_id_term v2", new(AddIndexMigration).
+		Table("dashboard_tag").Columns("dashboard_id", "term").Unique())
+
+	//------- copy data from table -------------------
+	mg.AddMigration("copy data from dashboard_old table", new(CopyTableDataMigration).
+		Source("dashboard_old", "id, version, slug, title, data, account_id, created, updated").
+		Target("dashboard", "id, version, slug, title, data, org_id, created, updated"))
+
+	mg.AddMigration("Drop old table dashboard_old", new(DropTableMigration).Table("dashboard_old"))
+}

pkg/services/sqlstore/migrations/datasource_mig.go

@@ -0,0 +1,82 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addDataSourceMigration(mg *Migrator) {
+	mg.AddMigration("create data_source table", new(AddTableMigration).
+		Name("data_source").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "database", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "basic_auth", Type: DB_Bool, Nullable: false},
+		&Column{Name: "basic_auth_user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "basic_auth_password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "is_default", Type: DB_Bool, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//-------  indexes ------------------
+	mg.AddMigration("add index data_source.account_id", new(AddIndexMigration).
+		Table("data_source").Columns("account_id"))
+
+	mg.AddMigration("add unique index data_source.account_id_name", new(AddIndexMigration).
+		Table("data_source").Columns("account_id", "name").Unique())
+
+	// ---------------------
+	// account -> org changes
+
+	//-------  drop indexes ------------------
+	mg.AddMigration("drop index data_source.account_id", new(DropIndexMigration).
+		Table("data_source").Columns("account_id"))
+
+	mg.AddMigration("drop unique index data_source.account_id_name", new(DropIndexMigration).
+		Table("data_source").Columns("account_id", "name").Unique())
+
+	//------- rename table ------------------
+	mg.AddMigration("rename table data_source to data_source_old", new(RenameTableMigration).
+		Rename("data_source", "data_source_old"))
+
+	//------- recreate table with new column names ------------------
+	mg.AddMigration("create data_source table v2", new(AddTableMigration).
+		Name("data_source").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "org_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "database", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "basic_auth", Type: DB_Bool, Nullable: false},
+		&Column{Name: "basic_auth_user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "basic_auth_password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "is_default", Type: DB_Bool, Nullable: false},
+		&Column{Name: "json_data", Type: DB_Text, Nullable: true},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//------- data_source table indexes ------------------
+	mg.AddMigration("add index data_source.org_id", new(AddIndexMigration).
+		Table("data_source").Columns("org_id"))
+
+	mg.AddMigration("add unique index data_source.org_id_name", new(AddIndexMigration).
+		Table("data_source").Columns("org_id", "name").Unique())
+
+	//------- copy data from table -------------------
+	mg.AddMigration("copy data from data_source_old table", new(CopyTableDataMigration).
+		Source("data_source_old", "id, account_id, version, type, name, access, url, password, user, database, basic_auth, basic_auth_user, basic_auth_password, is_default, created, updated").
+		Target("data_source", "id, org_id, version, type, name, access, url, password, user, database, basic_auth, basic_auth_user, basic_auth_password, is_default, created, updated"))
+
+	mg.AddMigration("Drop old table data_source_old", new(DropTableMigration).Table("data_source_old"))
+}

pkg/services/sqlstore/migrations/migrations.go

@@ -0,0 +1,42 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+// --- Migration Guide line ---
+// 1. Never change a migration that is committed and pushed to master
+// 2. Always add new migrations (to change or undo previous migrations)
+// 3. Some migraitons are not yet written (rename column, table, drop table, index etc)
+
+func AddMigrations(mg *Migrator) {
+	addMigrationLogMigrations(mg)
+	addUserMigrations(mg)
+	addStarMigrations(mg)
+	addOrgMigrations(mg)
+	addDashboardMigration(mg)
+	addDataSourceMigration(mg)
+	addApiKeyMigrations(mg)
+}
+
+func addMigrationLogMigrations(mg *Migrator) {
+	mg.AddMigration("create migration_log table", new(AddTableMigration).
+		Name("migration_log").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "migration_id", Type: DB_NVarchar, Length: 255},
+		&Column{Name: "sql", Type: DB_Text},
+		&Column{Name: "success", Type: DB_Bool},
+		&Column{Name: "error", Type: DB_Text},
+		&Column{Name: "timestamp", Type: DB_DateTime},
+	))
+}
+
+func addStarMigrations(mg *Migrator) {
+	mg.AddMigration("create star table", new(AddTableMigration).
+		Name("star").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "user_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "dashboard_id", Type: DB_BigInt, Nullable: false},
+	))
+
+	mg.AddMigration("add unique index star.user_id_dashboard_id", new(AddIndexMigration).
+		Table("star").Columns("user_id", "dashboard_id").Unique())
+}

pkg/services/sqlstore/migrations_test.go → pkg/services/sqlstore/migrations/migrations_test.go

@@ -1,4 +1,4 @@
-package sqlstore
+package migrations
 
 import (
 	"fmt"

pkg/services/sqlstore/migrations/org_mig.go

@@ -0,0 +1,55 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addOrgMigrations(mg *Migrator) {
+	//-------  org table -------------------
+	mg.AddMigration("create org table", new(AddTableMigration).
+		Name("org").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "address1", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "address2", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "city", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "zip_code", Type: DB_NVarchar, Length: 50, Nullable: true},
+		&Column{Name: "country", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "billing_email", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//-------  indices -------------------
+	mg.AddMigration("add unique index org.name", new(AddIndexMigration).
+		Table("org").Columns("name").Unique())
+
+	//-------  org_user table -------------------
+	mg.AddMigration("create org_user table", new(AddTableMigration).
+		Name("org_user").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "org_id", Type: DB_BigInt},
+		&Column{Name: "user_id", Type: DB_BigInt},
+		&Column{Name: "role", Type: DB_NVarchar, Length: 20},
+		&Column{Name: "created", Type: DB_DateTime},
+		&Column{Name: "updated", Type: DB_DateTime},
+	))
+
+	//-------  indices -------------------
+	mg.AddMigration("add unique index org_user_aid_uid", new(AddIndexMigration).
+		Name("org_user_aid_uid").Table("org_user").Columns("org_id", "user_id").Unique())
+
+	//-------  TEMP table rename / copy data -------------------
+	mg.AddMigration("copy data from old account table", new(CopyTableDataMigration).
+		Source("account", "id, version, name, created, updated").
+		Target("org", "id, version, name, created, updated").
+		IfTableExists("account"))
+
+	mg.AddMigration("copy data from old account_user table", new(CopyTableDataMigration).
+		Source("account_user", "id, account_id, user_id, role, created, updated").
+		Target("org_user", "id, org_id, user_id, role, created, updated").
+		IfTableExists("account_user"))
+
+	mg.AddMigration("Drop old table account", new(DropTableMigration).Table("account"))
+	mg.AddMigration("Drop old table account_user", new(DropTableMigration).Table("account_user"))
+}

pkg/services/sqlstore/migrations/user_mig.go

@@ -0,0 +1,84 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addUserMigrations(mg *Migrator) {
+	mg.AddMigration("create user table", new(AddTableMigration).
+		Name("user").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "login", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "email", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
+		&Column{Name: "rands", Type: DB_NVarchar, Length: 50, Nullable: true},
+		&Column{Name: "company", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "account_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "is_admin", Type: DB_Bool, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	mg.AddMigration("Add email_verified flag", new(AddColumnMigration).
+		Table("user").Column(&Column{Name: "email_verified", Type: DB_Bool, Nullable: true}))
+
+	mg.AddMigration("Add user.theme column", new(AddColumnMigration).
+		Table("user").Column(&Column{Name: "theme", Type: DB_Varchar, Nullable: true, Length: 20}))
+
+	//-------  user table indexes ------------------
+	mg.AddMigration("add unique index user.login", new(AddIndexMigration).
+		Table("user").Columns("login").Unique())
+
+	mg.AddMigration("add unique index user.email", new(AddIndexMigration).
+		Table("user").Columns("email").Unique())
+
+	// ---------------------
+	// account -> org changes
+
+	//-------  drop indexes ------------------
+	mg.AddMigration("drop unique index user.login", new(DropIndexMigration).
+		Table("user").Columns("login").Unique())
+
+	mg.AddMigration("drop unique index user.email", new(DropIndexMigration).
+		Table("user").Columns("email").Unique())
+
+	//------- rename table ------------------
+	mg.AddMigration("rename table user to user_old", new(RenameTableMigration).
+		Rename("user", "user_old"))
+
+	//------- recreate table with new column names ------------------
+	mg.AddMigration("create user table v2", new(AddTableMigration).
+		Name("user").WithColumns(
+		&Column{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+		&Column{Name: "version", Type: DB_Int, Nullable: false},
+		&Column{Name: "login", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "email", Type: DB_NVarchar, Length: 255, Nullable: false},
+		&Column{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
+		&Column{Name: "rands", Type: DB_NVarchar, Length: 50, Nullable: true},
+		&Column{Name: "company", Type: DB_NVarchar, Length: 255, Nullable: true},
+		&Column{Name: "org_id", Type: DB_BigInt, Nullable: false},
+		&Column{Name: "email_verified", Type: DB_Bool, Nullable: true},
+		&Column{Name: "theme", Type: DB_NVarchar, Nullable: true},
+		&Column{Name: "is_admin", Type: DB_Bool, Nullable: false},
+		&Column{Name: "created", Type: DB_DateTime, Nullable: false},
+		&Column{Name: "updated", Type: DB_DateTime, Nullable: false},
+	))
+
+	//-------  user table indexes ------------------
+	mg.AddMigration("add unique index user.login v2", new(AddIndexMigration).
+		Table("user").Columns("login").Unique())
+
+	mg.AddMigration("add unique index user.email v2", new(AddIndexMigration).
+		Table("user").Columns("email").Unique())
+
+	//------- copy data from user_old table -------------------
+	mg.AddMigration("copy data from user_old table", new(CopyTableDataMigration).
+		Source("user_old", "id, version, login, email, name, password, salt, rands, company, account_id, is_admin, created, updated").
+		Target("user", "id, version, login, email, name, password, salt, rands, company, org_id, is_admin, created, updated"))
+
+	mg.AddMigration("Drop old table user_old", new(DropTableMigration).Table("user_old"))
+
+}

pkg/services/sqlstore/migrator/conditions.go

@@ -0,0 +1,13 @@
+package migrator
+
+type MigrationCondition interface {
+	Sql(dialect Dialect) (string, []interface{})
+}
+
+type IfTableExistsCondition struct {
+	TableName string
+}
+
+func (c *IfTableExistsCondition) Sql(dialect Dialect) (string, []interface{}) {
+	return dialect.TableCheckSql(c.TableName)
+}

pkg/services/sqlstore/migrator/dialect.go

@@ -20,8 +20,12 @@ type Dialect interface {
 	CreateIndexSql(tableName string, index *Index) string
 	CreateTableSql(table *Table) string
 	AddColumnSql(tableName string, Col *Column) string
+	CopyTableData(sourceTable string, targetTable string, sourceCols string, targetCols string) string
+	DropTable(tableName string) string
+	DropIndexSql(tableName string, index *Index) string
 
 	TableCheckSql(tableName string) (string, []interface{})
+	RenameTable(oldName string, newName string) string
 }
 
 func NewDialect(name string) Dialect {
@@ -113,3 +117,25 @@ func (db *BaseDialect) CreateIndexSql(tableName string, index *Index) string {
 		quote(idxName), quote(tableName),
 		quote(strings.Join(index.Cols, quote(","))))
 }
+
+func (db *BaseDialect) CopyTableData(sourceTable string, targetTable string, sourceCols string, targetCols string) string {
+	quote := db.dialect.Quote
+	return fmt.Sprintf("INSERT INTO %s (%s) SELECT %s FROM %s", quote(targetTable), targetCols, sourceCols, quote(sourceTable))
+}
+
+func (db *BaseDialect) DropTable(tableName string) string {
+	quote := db.dialect.Quote
+	return fmt.Sprintf("DROP TABLE IF EXISTS %s", quote(tableName))
+}
+
+func (db *BaseDialect) RenameTable(oldName string, newName string) string {
+	quote := db.dialect.Quote
+	return fmt.Sprintf("ALTER TABLE %s RENAME TO %s", quote(oldName), quote(newName))
+}
+
+func (db *BaseDialect) DropIndexSql(tableName string, index *Index) string {
+	quote := db.dialect.Quote
+	var name string
+	name = index.XName(tableName)
+	return fmt.Sprintf("DROP INDEX %v ON %s", quote(name), quote(tableName))
+}

pkg/services/sqlstore/migrator/builder.go → pkg/services/sqlstore/migrator/migrations.go

@@ -6,7 +6,8 @@ import (
 )
 
 type MigrationBase struct {
-	id string
+	id        string
+	Condition MigrationCondition
 }
 
 func (m *MigrationBase) Id() string {
@@ -17,6 +18,10 @@ func (m *MigrationBase) SetId(id string) {
 	m.id = id
 }
 
+func (m *MigrationBase) GetCondition() MigrationCondition {
+	return m.Condition
+}
+
 type RawSqlMigration struct {
 	MigrationBase
 
@@ -98,6 +103,39 @@ func (m *AddIndexMigration) Sql(dialect Dialect) string {
 	return dialect.CreateIndexSql(m.tableName, &m.index)
 }
 
+type DropIndexMigration struct {
+	MigrationBase
+	tableName string
+	index     Index
+}
+
+func (m *DropIndexMigration) Name(name string) *DropIndexMigration {
+	m.index.Name = name
+	return m
+}
+
+func (m *DropIndexMigration) Table(tableName string) *DropIndexMigration {
+	m.tableName = tableName
+	return m
+}
+
+func (m *DropIndexMigration) Unique() *DropIndexMigration {
+	m.index.Type = UniqueIndex
+	return m
+}
+
+func (m *DropIndexMigration) Columns(columns ...string) *DropIndexMigration {
+	m.index.Cols = columns
+	return m
+}
+
+func (m *DropIndexMigration) Sql(dialect Dialect) string {
+	if m.index.Name == "" {
+		m.index.Name = fmt.Sprintf("%s", strings.Join(m.index.Cols, "_"))
+	}
+	return dialect.DropIndexSql(m.tableName, &m.index)
+}
+
 type AddTableMigration struct {
 	MigrationBase
 	table Table
@@ -130,20 +168,66 @@ func (m *AddTableMigration) WithColumn(col *Column) *AddTableMigration {
 	return m
 }
 
-type RenameColumnMigration struct {
+type DropTableMigration struct {
 	MigrationBase
 	tableName string
-	oldName   string
-	newName   string
 }
 
-func (m *RenameColumnMigration) Table(tableName string) *RenameColumnMigration {
+func (m *DropTableMigration) Table(tableName string) *DropTableMigration {
 	m.tableName = tableName
 	return m
 }
 
-func (m *RenameColumnMigration) Rename(oldName string, newName string) *RenameColumnMigration {
+func (m *DropTableMigration) Sql(d Dialect) string {
+	return d.DropTable(m.tableName)
+}
+
+type RenameTableMigration struct {
+	MigrationBase
+	oldName string
+	newName string
+}
+
+func (m *RenameTableMigration) IfTableExists(tableName string) *RenameTableMigration {
+	m.Condition = &IfTableExistsCondition{TableName: tableName}
+	return m
+}
+
+func (m *RenameTableMigration) Rename(oldName string, newName string) *RenameTableMigration {
 	m.oldName = oldName
 	m.newName = newName
 	return m
 }
+
+func (m *RenameTableMigration) Sql(d Dialect) string {
+	return d.RenameTable(m.oldName, m.newName)
+}
+
+type CopyTableDataMigration struct {
+	MigrationBase
+	sourceTable string
+	targetTable string
+	sourceCols  string
+	targetCols  string
+}
+
+func (m *CopyTableDataMigration) Source(tableName string, cols string) *CopyTableDataMigration {
+	m.sourceTable = tableName
+	m.sourceCols = cols
+	return m
+}
+
+func (m *CopyTableDataMigration) Target(tableName string, cols string) *CopyTableDataMigration {
+	m.targetTable = tableName
+	m.targetCols = cols
+	return m
+}
+
+func (m *CopyTableDataMigration) IfTableExists(tableName string) *CopyTableDataMigration {
+	m.Condition = &IfTableExistsCondition{TableName: tableName}
+	return m
+}
+
+func (m *CopyTableDataMigration) Sql(d Dialect) string {
+	return d.CopyTableData(m.sourceTable, m.targetTable, m.sourceCols, m.targetCols)
+}

pkg/services/sqlstore/migrator/migrator.go

@@ -118,6 +118,17 @@ func (mg *Migrator) exec(m Migration) error {
 	}
 
 	err := mg.inTransaction(func(sess *xorm.Session) error {
+
+		condition := m.GetCondition()
+		if condition != nil {
+			sql, args := condition.Sql(mg.dialect)
+			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
+			}
+		}
+
 		_, err := sess.Exec(m.Sql(mg.dialect))
 		if err != nil {
 			log.Error(3, "Migrator: exec FAILED migration id: %v, err: %v", m.Id(), err)

pkg/services/sqlstore/migrator/postgres_dialect.go

@@ -1,6 +1,9 @@
 package migrator
 
-import "strconv"
+import (
+	"fmt"
+	"strconv"
+)
 
 type Postgres struct {
 	BaseDialect
@@ -84,3 +87,9 @@ func (db *Postgres) TableCheckSql(tableName string) (string, []interface{}) {
 	sql := "SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=?"
 	return sql, args
 }
+
+func (db *Postgres) DropIndexSql(tableName string, index *Index) string {
+	quote := db.Quote
+	idxName := index.XName(tableName)
+	return fmt.Sprintf("DROP INDEX %v", quote(idxName))
+}

pkg/services/sqlstore/migrator/sqlite_dialect.go

@@ -1,5 +1,7 @@
 package migrator
 
+import "fmt"
+
 type Sqlite3 struct {
 	BaseDialect
 }
@@ -57,3 +59,10 @@ func (db *Sqlite3) TableCheckSql(tableName string) (string, []interface{}) {
 	args := []interface{}{tableName}
 	return "SELECT name FROM sqlite_master WHERE type='table' and name = ?", args
 }
+
+func (db *Sqlite3) DropIndexSql(tableName string, index *Index) string {
+	quote := db.Quote
+	//var unique string
+	idxName := index.XName(tableName)
+	return fmt.Sprintf("DROP INDEX %v", quote(idxName))
+}

pkg/services/sqlstore/migrator/types.go

@@ -1,5 +1,10 @@
 package migrator
 
+import (
+	"fmt"
+	"strings"
+)
+
 const (
 	POSTGRES = "postgres"
 	SQLITE   = "sqlite3"
@@ -10,6 +15,7 @@ type Migration interface {
 	Sql(dialect Dialect) string
 	Id() string
 	SetId(string)
+	GetCondition() MigrationCondition
 }
 
 type SQLType string
@@ -37,6 +43,17 @@ type Index struct {
 	Cols []string
 }
 
+func (index *Index) XName(tableName string) string {
+	if !strings.HasPrefix(index.Name, "UQE_") &&
+		!strings.HasPrefix(index.Name, "IDX_") {
+		if index.Type == UniqueIndex {
+			return fmt.Sprintf("UQE_%v_%v", tableName, index.Name)
+		}
+		return fmt.Sprintf("IDX_%v_%v", tableName, index.Name)
+	}
+	return index.Name
+}
+
 var (
 	DB_Bit       = "BIT"
 	DB_TinyInt   = "TINYINT"

pkg/services/sqlstore/sqlstore.go

@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrations"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
 
@@ -73,7 +74,7 @@ func SetEngine(engine *xorm.Engine, enableLog bool) (err error) {
 
 	migrator := migrator.NewMigrator(x)
 	migrator.LogLevel = log.INFO
-	addMigrations(migrator)
+	migrations.AddMigrations(migrator)
 
 	if err := migrator.Start(); err != nil {
 		return fmt.Errorf("Sqlstore::Migration failed err: %v\n", err)