Skip to content

Commit 8547ab5

Browse files
Sumit189Sumit189
committed
Convert UID to String
1 parent b2d0c50 commit 8547ab5

File tree

10 files changed

+20
-25
lines changed

10 files changed

+20
-25
lines changed

‎models/issues/comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ func UpdateCommentsMigrationsByType(ctx context.Context, tp structs.GitServiceTy
11871187
Update(map[string]any{
11881188
"poster_id": posterID,
11891189
"original_author": "",
1190-
"original_author_id": 0,
1190+
"original_author_id": "0",
11911191
})
11921192
return err
11931193
}

‎models/issues/issue_update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ func UpdateIssuesMigrationsByType(ctx context.Context, gitServiceType api.GitSer
623623
Update(map[string]any{
624624
"poster_id": posterID,
625625
"original_author": "",
626-
"original_author_id": 0,
626+
"original_author_id": "0",
627627
})
628628
return err
629629
}
@@ -636,7 +636,7 @@ func UpdateReactionsMigrationsByType(ctx context.Context, gitServiceType api.Git
636636
Update(map[string]any{
637637
"user_id": userID,
638638
"original_author": "",
639-
"original_author_id": 0,
639+
"original_author_id": "0",
640640
})
641641
return err
642642
}

‎models/issues/reaction.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (opts *FindReactionsOptions) toConds() builder.Cond {
130130
if opts.UserID > 0 {
131131
cond = cond.And(builder.Eq{
132132
"reaction.user_id": opts.UserID,
133-
"reaction.original_author_id": 0,
133+
"reaction.original_author_id": "0",
134134
})
135135
}
136136
if opts.Reaction != "" {
@@ -249,7 +249,7 @@ func DeleteReaction(ctx context.Context, opts *ReactionOptions) error {
249249
CommentID: opts.CommentID,
250250
}
251251

252-
sess := db.GetEngine(ctx).Where("original_author_id = 0")
252+
sess := db.GetEngine(ctx).Where("original_author_id = '0'")
253253
if opts.CommentID == -1 {
254254
reaction.CommentID = 0
255255
sess.MustCols("comment_id")

‎models/issues/review.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ func GetReviewByIssueIDAndUserID(ctx context.Context, issueID, userID int64) (*R
514514

515515
has, err := db.GetEngine(ctx).Where(
516516
builder.In("type", ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest).
517-
And(builder.Eq{"issue_id": issueID, "reviewer_id": userID, "original_author_id": 0})).
517+
And(builder.Eq{"issue_id": issueID, "reviewer_id": userID, "original_author_id": "0"})).
518518
Desc("id").
519519
Get(review)
520520
if err != nil {
@@ -1050,7 +1050,7 @@ func UpdateReviewsMigrationsByType(ctx context.Context, tp structs.GitServiceTyp
10501050
Update(map[string]any{
10511051
"reviewer_id": posterID,
10521052
"original_author": "",
1053-
"original_author_id": 0,
1053+
"original_author_id": "0",
10541054
})
10551055
return err
10561056
}

‎models/issues/review_list.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func GetReviewersFromOriginalAuthorsByIssueID(ctx context.Context, issueID int64
134134
reviews := make([]*Review, 0, 10)
135135

136136
// Get latest review of each reviewer, sorted in order they were made
137-
if err := db.GetEngine(ctx).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND original_author_id <> 0 GROUP BY issue_id, original_author_id) ORDER BY review.updated_unix ASC",
137+
if err := db.GetEngine(ctx).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND original_author_id <> '0' GROUP BY issue_id, original_author_id) ORDER BY review.updated_unix ASC",
138138
issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest).
139139
Find(&reviews); err != nil {
140140
return nil, err
@@ -150,14 +150,14 @@ func GetReviewsByIssueID(ctx context.Context, issueID int64) (ReviewList, error)
150150
sess := db.GetEngine(ctx)
151151

152152
// Get latest review of each reviewer, sorted in order they were made
153-
if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND dismissed = ? AND original_author_id = 0 GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC",
153+
if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = 0 AND type in (?, ?, ?) AND dismissed = ? AND original_author_id = '0' GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC",
154154
issueID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, false).
155155
Find(&reviews); err != nil {
156156
return nil, err
157157
}
158158

159159
teamReviewRequests := make([]*Review, 0, 5)
160-
if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id <> 0 AND original_author_id = 0 GROUP BY issue_id, reviewer_team_id) ORDER BY review.updated_unix ASC",
160+
if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id <> 0 AND original_author_id = '0' GROUP BY issue_id, reviewer_team_id) ORDER BY review.updated_unix ASC",
161161
issueID).
162162
Find(&teamReviewRequests); err != nil {
163163
return nil, err

‎models/migrations/migrations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ var migrations = []Migration{
592592
// v299 -> v300
593593
NewMigration("Add content version to issue and comment table", v1_23.AddContentVersionToIssueAndComment),
594594
// v300 -> v301
595-
NewMigration("Convert original_author_id of issue, comments, release, reaction and review table to numeric", v1_23.ConvertAuthorIDToNumeric),
595+
NewMigration("Convert original_author_id of issue, comments, release, reaction and review table to string", v1_23.ConvertAuthorIDToString),
596596
}
597597

598598
// GetCurrentDBVersion returns the current db version

‎models/migrations/v1_23/v300.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@ package v1_23 //nolint
66
import (
77
"strings"
88

9-
"code.gitea.io/gitea/modules/setting"
10-
119
"xorm.io/xorm"
1210
)
1311

14-
func ConvertAuthorIDToNumeric(x *xorm.Engine) error {
12+
func ConvertAuthorIDToString(x *xorm.Engine) error {
1513
// Google OAuth2 provider may give very long user IDs
16-
if !setting.Database.Type.IsPostgreSQL() {
17-
return nil
18-
}
1914
sql := strings.Join([]string{
20-
"ALTER TABLE issue ALTER COLUMN original_author_id TYPE NUMERIC USING original_author_id::NUMERIC;",
21-
"ALTER TABLE comment ALTER COLUMN original_author_id TYPE NUMERIC USING original_author_id::NUMERIC;",
22-
"ALTER TABLE release ALTER COLUMN original_author_id TYPE NUMERIC USING original_author_id::NUMERIC;",
23-
"ALTER TABLE reaction ALTER COLUMN original_author_id TYPE NUMERIC USING original_author_id::NUMERIC;",
24-
"ALTER TABLE review ALTER COLUMN original_author_id TYPE NUMERIC USING original_author_id::NUMERIC;",
15+
"ALTER TABLE issue ALTER COLUMN original_author_id TYPE VARCHAR(255) USING original_author_id::VARCHAR;",
16+
"ALTER TABLE comment ALTER COLUMN original_author_id TYPE VARCHAR(255) USING original_author_id::VARCHAR;",
17+
"ALTER TABLE release ALTER COLUMN original_author_id TYPE VARCHAR(255) USING original_author_id::VARCHAR;",
18+
"ALTER TABLE reaction ALTER COLUMN original_author_id TYPE VARCHAR(255) USING original_author_id::VARCHAR;",
19+
"ALTER TABLE review ALTER COLUMN original_author_id TYPE VARCHAR(255) USING original_author_id::VARCHAR;",
2520
}, " ")
2621

2722
_, err := x.Exec(sql)

‎models/repo/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func UpdateReleasesMigrationsByType(ctx context.Context, gitServiceType structs.
432432
Update(map[string]any{
433433
"publisher_id": posterID,
434434
"original_author": "",
435-
"original_author_id": 0,
435+
"original_author_id": "0",
436436
})
437437
return err
438438
}

‎modules/structs/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Issue struct {
5050
Index int64 `json:"number"`
5151
Poster *User `json:"user"`
5252
OriginalAuthor string `json:"original_author"`
53-
OriginalAuthorID int64 `json:"original_author_id"`
53+
OriginalAuthorID string `json:"original_author_id"`
5454
Title string `json:"title"`
5555
Body string `json:"body"`
5656
Ref string `json:"ref"`

‎modules/structs/issue_comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type Comment struct {
1515
IssueURL string `json:"issue_url"`
1616
Poster *User `json:"user"`
1717
OriginalAuthor string `json:"original_author"`
18-
OriginalAuthorID int64 `json:"original_author_id"`
18+
OriginalAuthorID string `json:"original_author_id"`
1919
Body string `json:"body"`
2020
Attachments []*Attachment `json:"assets"`
2121
// swagger:strfmt date-time

0 commit comments

Comments
 (0)