Skip to content

Commit

Permalink
fix: order-by clause and span names (#4200)
Browse files Browse the repository at this point in the history
  • Loading branch information
alnr authored Nov 8, 2024
1 parent 6a40ec8 commit b6278af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion persistence/sql/identity/persister_identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ func QueryForCredentials(con *pop.Connection, where ...Where) (credentialsPerIde
).LeftJoin(identifiersTableNameWithIndexHint(con),
"identity_credential_identifiers.identity_credential_id = identity_credentials.id AND identity_credential_identifiers.nid = identity_credentials.nid",
).Order(
"identity_credentials.id ASC",
"identity_credential_identifiers.identifier ASC",
)
for _, w := range where {
q = q.Where("("+w.Condition+")", w.Args...)
Expand Down
2 changes: 1 addition & 1 deletion selfservice/hook/show_verification_ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (e *ShowVerificationUIHook) ExecutePostRegistrationPostPersistHook(_ http.R
// ExecuteLoginPostHook adds redirect headers and status code if the request is a browser request.
// If the request is not a browser request, this hook does nothing.
func (e *ShowVerificationUIHook) ExecuteLoginPostHook(_ http.ResponseWriter, r *http.Request, _ node.UiNodeGroup, f *login.Flow, _ *session.Session) error {
return otelx.WithSpan(r.Context(), "selfservice.hook.ShowVerificationUIHook.ExecutePostRegistrationPostPersistHook", func(ctx context.Context) error {
return otelx.WithSpan(r.Context(), "selfservice.hook.ShowVerificationUIHook.ExecuteLoginPostHook", func(ctx context.Context) error {
return e.execute(r.WithContext(ctx), f)
})
}
Expand Down

0 comments on commit b6278af

Please sign in to comment.