Skip to content

Commit f432a17

Browse files
ryantxuryantxu
authored
SQLTemplate: Swap the IFace with the concrete struct (grafana#92008)
1 parent 32a5651 commit f432a17

File tree

19 files changed

+271
-271
lines changed

19 files changed

+271
-271
lines changed

‎pkg/registry/apis/dashboard/legacy/queries.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var (
2929
)
3030

3131
type sqlQuery struct {
32-
sqltemplate.SQLTemplateIface
32+
sqltemplate.SQLTemplate
3333
Query *DashboardQuery
3434
}
3535

‎pkg/registry/apis/dashboard/legacy/queries_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestQueries(t *testing.T) {
1515
{
1616
Name: "history_uid",
1717
Data: &sqlQuery{
18-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
18+
SQLTemplate: mocks.NewTestingSQLTemplate(),
1919
Query: &DashboardQuery{
2020
OrgID: 2,
2121
UID: "UUU",
@@ -25,7 +25,7 @@ func TestQueries(t *testing.T) {
2525
{
2626
Name: "history_uid_at_version",
2727
Data: &sqlQuery{
28-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
28+
SQLTemplate: mocks.NewTestingSQLTemplate(),
2929
Query: &DashboardQuery{
3030
OrgID: 2,
3131
UID: "UUU",
@@ -36,7 +36,7 @@ func TestQueries(t *testing.T) {
3636
{
3737
Name: "history_uid_second_page",
3838
Data: &sqlQuery{
39-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
39+
SQLTemplate: mocks.NewTestingSQLTemplate(),
4040
Query: &DashboardQuery{
4141
OrgID: 2,
4242
UID: "UUU",
@@ -47,7 +47,7 @@ func TestQueries(t *testing.T) {
4747
{
4848
Name: "dashboard",
4949
Data: &sqlQuery{
50-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
50+
SQLTemplate: mocks.NewTestingSQLTemplate(),
5151
Query: &DashboardQuery{
5252
OrgID: 2,
5353
},
@@ -56,7 +56,7 @@ func TestQueries(t *testing.T) {
5656
{
5757
Name: "dashboard_next_page",
5858
Data: &sqlQuery{
59-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
59+
SQLTemplate: mocks.NewTestingSQLTemplate(),
6060
Query: &DashboardQuery{
6161
OrgID: 2,
6262
LastID: 22,

‎pkg/registry/apis/dashboard/legacy/sql_dashboards.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ func (a *dashboardSqlAccess) getRows(ctx context.Context, query *DashboardQuery)
9292
}
9393

9494
req := sqlQuery{
95-
SQLTemplateIface: sqltemplate.New(a.dialect),
96-
Query: query,
95+
SQLTemplate: sqltemplate.New(a.dialect),
96+
Query: query,
9797
}
9898

9999
tmpl := sqlQueryDashboards

‎pkg/registry/apis/identity/legacy/legacy_sql.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func (s *legacySQLStore) ListTeams(ctx context.Context, ns claims.NamespaceInfo,
5555
}
5656

5757
req := sqlQueryListTeams{
58-
SQLTemplateIface: sqltemplate.New(s.dialect),
59-
Query: &query,
58+
SQLTemplate: sqltemplate.New(s.dialect),
59+
Query: &query,
6060
}
6161

6262
rawQuery, err := sqltemplate.Execute(sqlQueryTeams, req)
@@ -117,12 +117,12 @@ func (s *legacySQLStore) ListUsers(ctx context.Context, ns claims.NamespaceInfo,
117117
}
118118

119119
return s.queryUsers(ctx, sqlQueryUsers, sqlQueryListUsers{
120-
SQLTemplateIface: sqltemplate.New(s.dialect),
121-
Query: &query,
120+
SQLTemplate: sqltemplate.New(s.dialect),
121+
Query: &query,
122122
}, limit, query.UID != "")
123123
}
124124

125-
func (s *legacySQLStore) queryUsers(ctx context.Context, t *template.Template, req sqltemplate.ArgsIface, limit int, getRV bool) (*ListUserResult, error) {
125+
func (s *legacySQLStore) queryUsers(ctx context.Context, t *template.Template, req sqltemplate.Args, limit int, getRV bool) (*ListUserResult, error) {
126126
rawQuery, err := sqltemplate.Execute(t, req)
127127
if err != nil {
128128
return nil, fmt.Errorf("execute template %q: %w", sqlQueryUsers.Name(), err)
@@ -180,7 +180,7 @@ func (s *legacySQLStore) GetDisplay(ctx context.Context, ns claims.NamespaceInfo
180180
}
181181

182182
return s.queryUsers(ctx, sqlQueryDisplay, sqlQueryGetDisplay{
183-
SQLTemplateIface: sqltemplate.New(s.dialect),
184-
Query: &query,
183+
SQLTemplate: sqltemplate.New(s.dialect),
184+
Query: &query,
185185
}, 10000, false)
186186
}

‎pkg/registry/apis/identity/legacy/queries.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var (
3131
)
3232

3333
type sqlQueryListUsers struct {
34-
sqltemplate.SQLTemplateIface
34+
sqltemplate.SQLTemplate
3535
Query *ListUserQuery
3636
}
3737

@@ -40,7 +40,7 @@ func (r sqlQueryListUsers) Validate() error {
4040
}
4141

4242
type sqlQueryListTeams struct {
43-
sqltemplate.SQLTemplateIface
43+
sqltemplate.SQLTemplate
4444
Query *ListTeamQuery
4545
}
4646

@@ -49,7 +49,7 @@ func (r sqlQueryListTeams) Validate() error {
4949
}
5050

5151
type sqlQueryGetDisplay struct {
52-
sqltemplate.SQLTemplateIface
52+
sqltemplate.SQLTemplate
5353
Query *GetUserDisplayQuery
5454
}
5555

‎pkg/registry/apis/identity/legacy/queries_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestQueries(t *testing.T) {
1515
{
1616
Name: "teams_uid",
1717
Data: &sqlQueryListTeams{
18-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
18+
SQLTemplate: mocks.NewTestingSQLTemplate(),
1919
Query: &ListTeamQuery{
2020
UID: "abc",
2121
},
@@ -24,7 +24,7 @@ func TestQueries(t *testing.T) {
2424
{
2525
Name: "teams_page_1",
2626
Data: &sqlQueryListTeams{
27-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
27+
SQLTemplate: mocks.NewTestingSQLTemplate(),
2828
Query: &ListTeamQuery{
2929
Limit: 5,
3030
},
@@ -33,7 +33,7 @@ func TestQueries(t *testing.T) {
3333
{
3434
Name: "teams_page_2",
3535
Data: &sqlQueryListTeams{
36-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
36+
SQLTemplate: mocks.NewTestingSQLTemplate(),
3737
Query: &ListTeamQuery{
3838
ContinueID: 1,
3939
Limit: 2,
@@ -45,7 +45,7 @@ func TestQueries(t *testing.T) {
4545
{
4646
Name: "users_uid",
4747
Data: &sqlQueryListUsers{
48-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
48+
SQLTemplate: mocks.NewTestingSQLTemplate(),
4949
Query: &ListUserQuery{
5050
UID: "abc",
5151
},
@@ -54,7 +54,7 @@ func TestQueries(t *testing.T) {
5454
{
5555
Name: "users_page_1",
5656
Data: &sqlQueryListUsers{
57-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
57+
SQLTemplate: mocks.NewTestingSQLTemplate(),
5858
Query: &ListUserQuery{
5959
Limit: 5,
6060
},
@@ -63,7 +63,7 @@ func TestQueries(t *testing.T) {
6363
{
6464
Name: "users_page_2",
6565
Data: &sqlQueryListUsers{
66-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
66+
SQLTemplate: mocks.NewTestingSQLTemplate(),
6767
Query: &ListUserQuery{
6868
ContinueID: 1,
6969
Limit: 2,
@@ -75,7 +75,7 @@ func TestQueries(t *testing.T) {
7575
{
7676
Name: "display_uids",
7777
Data: &sqlQueryGetDisplay{
78-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
78+
SQLTemplate: mocks.NewTestingSQLTemplate(),
7979
Query: &GetUserDisplayQuery{
8080
OrgID: 2,
8181
UIDs: []string{"a", "b"},
@@ -85,7 +85,7 @@ func TestQueries(t *testing.T) {
8585
{
8686
Name: "display_ids",
8787
Data: &sqlQueryGetDisplay{
88-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
88+
SQLTemplate: mocks.NewTestingSQLTemplate(),
8989
Query: &GetUserDisplayQuery{
9090
OrgID: 2,
9191
IDs: []int64{1, 2},
@@ -95,7 +95,7 @@ func TestQueries(t *testing.T) {
9595
{
9696
Name: "display_ids_uids",
9797
Data: &sqlQueryGetDisplay{
98-
SQLTemplateIface: mocks.NewTestingSQLTemplate(),
98+
SQLTemplate: mocks.NewTestingSQLTemplate(),
9999
Query: &GetUserDisplayQuery{
100100
OrgID: 2,
101101
UIDs: []string{"a", "b"},

0 commit comments

Comments
 (0)