Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong table name #30557

Merged
merged 15 commits into from
Apr 23, 2024
Merged

Fix wrong table name #30557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
59e0207
Fix wrong table name
lunny Apr 18, 2024
7922845
Add test for the tablename
lunny Apr 18, 2024
437cca7
Fix the real problem
lunny Apr 18, 2024
712ab94
Fix wrong fixture file name
lunny Apr 18, 2024
a518726
Merge branch 'main' into lunny/fix_wrong_tablename
lunny Apr 18, 2024
f8d57dc
Add migration
lunny Apr 19, 2024
05674f7
Fix test
lunny Apr 19, 2024
20fbed7
Merge branch 'main' into lunny/fix_wrong_tablename
lunny Apr 19, 2024
99fef44
Follow wxiaoguang's suggestion
lunny Apr 20, 2024
c1a477d
Merge branch 'main' into lunny/fix_wrong_tablename
lunny Apr 20, 2024
c073714
Follow wxiaoguang's suggestion
lunny Apr 22, 2024
c41c6d2
Merge branch 'main' into lunny/fix_wrong_tablename
lunny Apr 22, 2024
4aa802d
Fix lint
lunny Apr 22, 2024
1c83895
Merge branch 'main' into lunny/fix_wrong_tablename
GiteaBot Apr 23, 2024
e8d8055
Merge branch 'main' into lunny/fix_wrong_tablename
GiteaBot Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Follow wxiaoguang's suggestion
  • Loading branch information
@lunny
lunny committed Apr 22, 2024
commit c073714c387919927b9f0ea1538e8c1b0ec55c0e
15 changes: 5 additions & 10 deletions models/migrations/v1_18/v230.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ 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 {
return x.Sync(new(oAuth2Application))
type oauth2Application struct {
ID int64
ConfidentialClient bool `xorm:"NOT NULL DEFAULT TRUE"`
}
return x.Sync(new(oauth2Application))
}
16 changes: 6 additions & 10 deletions models/migrations/v1_18/v230_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,14 @@ import (
"github.com/stretchr/testify/assert"
)

// premigration
type OAuth2Application struct {
ID int64
}

func (OAuth2Application) TableName() string {
return "oauth2_application"
}

func Test_AddConfidentialClientColumnToOAuth2ApplicationTable(t *testing.T) {
// premigration
type oauth2Application struct {
ID int64
}

// Prepare and load the testing database
x, deferable := base.PrepareTestEnv(t, 0, new(OAuth2Application))
x, deferable := base.PrepareTestEnv(t, 0, new(oAuth2Application))
defer deferable()
if x == nil || t.Failed() {
return
Expand Down