Fix joins in db.Find(AndCount)
#28978
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
KN4CK3R
commented
Jan 29, 2024
| @@ -133,27 +133,28 @@ type FindOptionsOrder interface { | |||
|
|
|||
| // Find represents a common find function which accept an options interface | |||
| func Find[T any](ctx context.Context, opts FindOptions) ([]*T, error) { | |||
| sess := GetEngine(ctx) | |||
| sess := GetEngine(ctx).Where(opts.ToConds()) | |||
There was a problem hiding this comment.
JoinFunc is a func(sess Engine) which can be called with xorm.Engine and xorm.Session. Inside the join func sess.Join is used. Now the problem is that Session.Join adds the JOIN to the statement while Engine.Join creates a new Session which gets discarded afterwards. So calling the JoinFunc with xorm.Engine does "nothing" while calling with xorm.Session does what it should.
GetEngine(ctx) returns a xorm.Engine and Where(...) creates the needed Session.
Comment on lines
+145
to
+149
| if orderOpt, ok := opts.(FindOptionsOrder); ok { | ||
| if order := orderOpt.ToOrders(); order != "" { | ||
| sess.OrderBy(order) | ||
| } | ||
| } |
There was a problem hiding this comment.
Add order support for Find.
Comment on lines
+192
to
+198
| if joinOpt, ok := opts.(FindOptionsJoin); ok { | ||
| for _, joinFunc := range joinOpt.ToJoins() { | ||
| if err := joinFunc(sess); err != nil { | ||
| return nil, 0, err | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Add join support for FindAndCount.
delvh
approved these changes
Jan 29, 2024
GiteaBot
added
lgtm/need 1
lunny
approved these changes
Jan 30, 2024
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
henrygoodman
pushed a commit
to henrygoodman/gitea
that referenced
this pull request
Jan 31, 2024
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Feb 1, 2024
* origin/main: [skip ci] Updated translations via Crowdin Fix UI Spacing Errors in mirror settings (go-gitea#28990) Add htmx guidelines (go-gitea#28993) Some refactor for git http (go-gitea#28995) Fix an actions schedule bug (go-gitea#28942) Fix doc img path in profile readme (go-gitea#28994) Introduce htmx and use it to avoid full page load on `Subscribe` and `Follow` (go-gitea#28908) Fix joins in `db.Find(AndCount)` (go-gitea#28978) Update golang links to use https (go-gitea#28980) Fix google logo in security page (go-gitea#28982)
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 1, 2024
* giteaofficial/main: Revert "Speed up loading the dashboard on mysql/mariadb (go-gitea#28546)" (go-gitea#29006) Update dorny/paths-filter action (go-gitea#29003) [skip ci] Updated translations via Crowdin Fix UI Spacing Errors in mirror settings (go-gitea#28990) Add htmx guidelines (go-gitea#28993) Some refactor for git http (go-gitea#28995) Fix an actions schedule bug (go-gitea#28942) Fix doc img path in profile readme (go-gitea#28994) Introduce htmx and use it to avoid full page load on `Subscribe` and `Follow` (go-gitea#28908) Fix joins in `db.Find(AndCount)` (go-gitea#28978) Update golang links to use https (go-gitea#28980) Fix google logo in security page (go-gitea#28982) Also match weakly validated ETags (go-gitea#28957)
silverwind
pushed a commit
to silverwind/gitea
that referenced
this pull request
Feb 20, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.