Ensure `setting.Database.UseXXX` has been set to the right value when installing #23350

wolfogre · 2023-03-07T06:27:50Z

setting.Database.Type has been modified, but setting.Database.UseXXX hasn't.

Lines 274 to 276 in 84a2993

    
           // Test database setting. 
        
           setting.Database.Type = form.DbType 
        
           setting.Database.Host = form.DbHost

So registerPostgresSchemaDriver will be missed when initing DB engine.

gitea/models/db/engine.go

Lines 104 to 110 in 84a2993

    
           if setting.Database.UsePostgreSQL && len(setting.Database.Schema) > 0 { 
        
           	// OK whilst we sort out our schema issues - create a schema aware postgres 
        
           	registerPostgresSchemaDriver() 
        
           	engine, err = xorm.NewEngine("postgresschema", connStr) 
        
           } else { 
        
           	engine, err = xorm.NewEngine(setting.Database.Type, connStr) 
        
           }

BTW, I think it will be a good idea to refactor setting.Database.UseXXX to methods.

Update: #23354

Replace #23350. Refactor `setting.Database.UseMySQL` to `setting.Database.Type.IsMySQL()`. To avoid mismatching between `Type` and `UseXXX`. This refactor can fix the bug mentioned in #23350, so it should be backported.

Replace go-gitea#23350. Refactor `setting.Database.UseMySQL` to `setting.Database.Type.IsMySQL()`. To avoid mismatching between `Type` and `UseXXX`. This refactor can fix the bug mentioned in go-gitea#23350, so it should be backported.

Backport #23354 Replace #23350. Refactor `setting.Database.UseMySQL` to `setting.Database.Type.IsMySQL()`. To avoid mismatching between `Type` and `UseXXX`. This refactor can fix the bug mentioned in #23350, so it should be backported. Co-authored-by: Jason Song <i@wolfogre.com>

fix: EnsureDBType

69f1b0b

wolfogre added type/bug outdated/backport/v1.18 This PR should be backported to Gitea 1.18 outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Mar 7, 2023

wolfogre added this to the 1.20.0 milestone Mar 7, 2023

lunny approved these changes Mar 7, 2023

View reviewed changes

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 7, 2023

wolfogre marked this pull request as draft March 7, 2023 06:35

wolfogre mentioned this pull request Mar 7, 2023

Refactor setting.Database.UseXXX to methods #23354

Merged

wolfogre closed this Mar 7, 2023

lunny removed this from the 1.20.0 milestone Mar 7, 2023

GiteaBot mentioned this pull request Mar 7, 2023

Refactor setting.Database.UseXXX to methods (#23354) #23356

Merged

delvh removed outdated/backport/v1.18 This PR should be backported to Gitea 1.18 outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Mar 14, 2023

go-gitea locked and limited conversation to collaborators May 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure `setting.Database.UseXXX` has been set to the right value when installing #23350

Ensure `setting.Database.UseXXX` has been set to the right value when installing #23350

wolfogre commented Mar 7, 2023 •

edited

	// Test database setting.
	setting.Database.Type = form.DbType
	setting.Database.Host = form.DbHost

	if setting.Database.UsePostgreSQL && len(setting.Database.Schema) > 0 {
	// OK whilst we sort out our schema issues - create a schema aware postgres
	registerPostgresSchemaDriver()
	engine, err = xorm.NewEngine("postgresschema", connStr)
	} else {
	engine, err = xorm.NewEngine(setting.Database.Type, connStr)
	}

Ensure setting.Database.UseXXX has been set to the right value when installing #23350

Ensure setting.Database.UseXXX has been set to the right value when installing #23350

Conversation

wolfogre commented Mar 7, 2023 • edited

Ensure `setting.Database.UseXXX` has been set to the right value when installing #23350

Ensure `setting.Database.UseXXX` has been set to the right value when installing #23350

wolfogre commented Mar 7, 2023 •

edited