remove unsupported tidb options

Author: lunny

models/migrations/migrations.go

@@ -383,7 +383,7 @@ func dropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin
 		if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, cols)); err != nil {
 			return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err)
 		}
-	case setting.Database.UseMySQL, setting.Database.UseTiDB:
+	case setting.Database.UseMySQL:
 		// Drop indexes on columns first
 		sql := fmt.Sprintf("SHOW INDEX FROM %s WHERE column_name IN ('%s')", tableName, strings.Join(columnNames, "','"))
 		res, err := sess.Query(sql)

models/migrations/v33.go

@@ -17,7 +17,7 @@ func removeActionColumns(x *xorm.Engine) error {
 	switch {
 	case setting.Database.UseSQLite3:
 		log.Warn("Unable to drop columns in SQLite")
-	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL, setting.Database.UseTiDB:
+	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL:
 		if _, err := x.Exec("ALTER TABLE action DROP COLUMN act_user_name"); err != nil {
 			return fmt.Errorf("DROP COLUMN act_user_name: %v", err)
 		} else if _, err = x.Exec("ALTER TABLE action DROP COLUMN repo_user_name"); err != nil {

models/migrations/v45.go

@@ -15,7 +15,7 @@ func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) {
 	switch {
 	case setting.Database.UseSQLite3:
 		log.Warn("Unable to drop columns in SQLite")
-	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL, setting.Database.UseTiDB:
+	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL:
 		if _, err := x.Exec("ALTER TABLE repo_unit DROP COLUMN `index`"); err != nil {
 			// Ignoring this error in case we run this migration second time (after migration reordering)
 			log.Warn("DROP COLUMN index: %v", err)

models/migrations/v50.go

@@ -42,7 +42,7 @@ func migrateProtectedBranchStruct(x *xorm.Engine) error {
 	switch {
 	case setting.Database.UseSQLite3:
 		log.Warn("Unable to drop columns in SQLite")
-	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL, setting.Database.UseTiDB:
+	case setting.Database.UseMySQL, setting.Database.UsePostgreSQL, setting.Database.UseMSSQL:
 		if _, err := x.Exec("ALTER TABLE protected_branch DROP COLUMN can_push"); err != nil {
 			// Ignoring this error in case we run this migration second time (after migration reordering)
 			log.Warn("DROP COLUMN can_push (skipping): %v", err)

models/models_test.go

@@ -22,6 +22,7 @@ func TestDumpDatabase(t *testing.T) {
 	assert.NoError(t, err)
 
 	for _, dbType := range setting.SupportedDatabases {
+		dbType = setting.GetDBTypeByName(dbType)
 		assert.NoError(t, DumpDatabase(filepath.Join(dir, dbType+".sql"), dbType))
 	}
 }

modules/setting/database.go

@@ -17,7 +17,8 @@ import (
 
 var (
 	// SupportedDatabases includes all supported databases type
-	SupportedDatabases = []string{"mysql", "postgres", "mssql"}
+	SupportedDatabases = []string{"MySQL", "PostgreSQL", "MSSQL"}
+	dbTypes            = map[string]string{"MySQL": "mysql", "PostgreSQL": "postgres", "MSSQL": "mssql", "SQLite3": "sqlite3"}
 
 	// EnableSQLite3 use SQLite3, set by build flag
 	EnableSQLite3 bool
@@ -41,7 +42,6 @@ var (
 		UseMySQL          bool
 		UseMSSQL          bool
 		UsePostgreSQL     bool
-		UseTiDB           bool
 		DBConnectRetries  int
 		DBConnectBackoff  time.Duration
 		MaxIdleConns      int
@@ -54,6 +54,11 @@ var (
 	}
 )
 
+// GetDBTypeByName returns the dataase type as it defined on XORM according the given name
+func GetDBTypeByName(name string) string {
+	return dbTypes[name]
+}
+
 // InitDBConfig loads the database settings
 func InitDBConfig() {
 	sec := Cfg.Section("database")
@@ -65,8 +70,6 @@ func InitDBConfig() {
 		Database.UseMySQL = true
 	case "postgres":
 		Database.UsePostgreSQL = true
-	case "tidb":
-		Database.UseTiDB = true
 	case "mssql":
 		Database.UseMSSQL = true
 	}

modules/setting/database_sqlite.go

@@ -12,5 +12,5 @@ import (
 
 func init() {
 	EnableSQLite3 = true
-	SupportedDatabases = append(SupportedDatabases, "sqlite3")
+	SupportedDatabases = append(SupportedDatabases, "SQLite3")
 }

routers/install.go

@@ -40,11 +40,7 @@ func InstallInit(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("install.install")
 	ctx.Data["PageIsInstall"] = true
 
-	dbOpts := []string{"MySQL", "PostgreSQL", "MSSQL"}
-	if setting.EnableSQLite3 {
-		dbOpts = append(dbOpts, "SQLite3")
-	}
-	ctx.Data["DbOptions"] = dbOpts
+	ctx.Data["DbOptions"] = setting.SupportedDatabases
 }
 
 // Install render installation page
@@ -144,8 +140,8 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
 
 	// Pass basic check, now test configuration.
 	// Test database setting.
-	dbTypes := map[string]string{"MySQL": "mysql", "PostgreSQL": "postgres", "MSSQL": "mssql", "SQLite3": "sqlite3"}
-	setting.Database.Type = dbTypes[form.DbType]
+
+	setting.Database.Type = setting.GetDBTypeByName(form.DbType)
 	setting.Database.Host = form.DbHost
 	setting.Database.User = form.DbUser
 	setting.Database.Passwd = form.DbPasswd