Skip to content

Always store primary email address into email_address table and also the state #15956

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

Merged
merged 18 commits into from
Jun 8, 2021
Merged

Always store primary email address into email_address table and also the state #15956

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2180ed1
Always store primary email address into email_address table and also …
lunny May 23, 2021
7ca9dfd
Add lower_email to not convert email to lower as what's added
lunny May 23, 2021
a4bab8e
Fix fixture
lunny May 23, 2021
09c7ae7
Fix tests
lunny May 24, 2021
a1896e9
Use BeforeInsert to save lower email
lunny May 24, 2021
06b9b4e
Fix v180 migration
lunny May 24, 2021
1b39dc7
fix tests
lunny May 30, 2021
1015f51
Fix test
lunny May 31, 2021
01aae82
Remove wrong submited codes
lunny Jun 1, 2021
3437a6f
Fix test
lunny Jun 1, 2021
57227c3
Fix test
lunny Jun 1, 2021
c7e7bfb
Fix test
lunny Jun 4, 2021
1ed31d1
Add test for v181 migration
lunny Jun 5, 2021
1ab6eb2
remove change user's email to lower
lunny Jun 5, 2021
5bb4124
Revert change on user's email column
lunny Jun 5, 2021
7e511d2
Fix lower email
lunny Jun 5, 2021
eb652a9
Fix test
lunny Jun 5, 2021
ce66547
Fix test
lunny Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove wrong submited codes
  • Loading branch information
@lunny
lunny committed Jun 8, 2021
commit 01aae825cba03e089ff12eac15d999c20631439a
14 changes: 0 additions & 14 deletions models/migrations/v180.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,6 @@ func deleteMigrationCredentials(x *xorm.Engine) (err error) {
"status": structs.TaskStatusStopped,
})

type EmailAddress struct {
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"INDEX NOT NULL"`
Email string `xorm:"UNIQUE NOT NULL"`
LowerEmail string `xorm:"UNIQUE NOT NULL"`
IsActivated bool
IsPrimary bool `xorm:"DEFAULT(false) NOT NULL"`
}

// change lower_email as unique
if err = x.Sync2(new(EmailAddress)); err != nil {
return
}

sess := x.NewSession()
defer sess.Close()

Expand Down