mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
ResourceStore: Fix sql List (#91043)
* fix resource list * ensure we get the resource version without FOR SHARE
This commit is contained in:
parent
8423d06988
commit
e4ed000d05
@ -541,6 +541,7 @@ func fetchLatestRV(ctx context.Context, x db.ContextExecer, d sqltemplate.Dialec
|
||||
SQLTemplate: sqltemplate.New(d),
|
||||
Group: group,
|
||||
Resource: resource,
|
||||
ReadOnly: true,
|
||||
resourceVersion: new(resourceVersion),
|
||||
})
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
|
@ -4,5 +4,7 @@ SELECT
|
||||
WHERE 1 = 1
|
||||
AND {{ .Ident "group" }} = {{ .Arg .Group }}
|
||||
AND {{ .Ident "resource" }} = {{ .Arg .Resource }}
|
||||
{{ if not .ReadOnly }}
|
||||
{{ .SelectFor "UPDATE" }}
|
||||
{{ end}}
|
||||
;
|
||||
|
@ -189,6 +189,7 @@ func (r *resourceVersion) Results() (*resourceVersion, error) {
|
||||
type sqlResourceVersionRequest struct {
|
||||
*sqltemplate.SQLTemplate
|
||||
Group, Resource string
|
||||
ReadOnly bool
|
||||
*resourceVersion
|
||||
}
|
||||
|
||||
|
@ -268,6 +268,7 @@ func TestQueries(t *testing.T) {
|
||||
Data: &sqlResourceVersionRequest{
|
||||
SQLTemplate: new(sqltemplate.SQLTemplate),
|
||||
resourceVersion: new(resourceVersion),
|
||||
ReadOnly: false,
|
||||
},
|
||||
Expected: expected{
|
||||
"resource_version_get_mysql.sql": dialects{
|
||||
|
Loading…
Reference in New Issue
Block a user