diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index fe6cbf6cf2..0829d31d51 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -13,13 +13,6 @@ import ( "github.com/stretchr/testify/assert" ) -func TestApplicationTableName(t *testing.T) { - e := unittest.GetXORMEngine() - tableInfo, err := e.TableInfo(new(auth_model.OAuth2Application)) - assert.NoError(t, err) - assert.EqualValues(t, "oauth2_application", tableInfo.Name) -} - func TestOAuth2Application_GenerateClientSecret(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) app := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: 1}) diff --git a/models/migrations/v1_18/v230.go b/models/migrations/v1_18/v230.go index f4f88ea330..4edbdb3f87 100644 --- a/models/migrations/v1_18/v230.go +++ b/models/migrations/v1_18/v230.go @@ -7,12 +7,16 @@ import ( "xorm.io/xorm" ) +type oAuth2Application struct { + ID int64 + ConfidentialClient bool `xorm:"NOT NULL DEFAULT TRUE"` +} + +func (oAuth2Application) TableName() string { + return "oauth2_application" +} + // AddConfidentialColumnToOAuth2ApplicationTable: add ConfidentialClient column, setting existing rows to true func AddConfidentialClientColumnToOAuth2ApplicationTable(x *xorm.Engine) error { - type OAuth2Application struct { - ID int64 - ConfidentialClient bool `xorm:"NOT NULL DEFAULT TRUE"` - } - - return x.Table("oauth2_application").Sync(new(OAuth2Application)) + return x.Sync(new(oAuth2Application)) }