SQLTemplates: Add helper to ensure all templates have a test-case (#103964)

* SQLTemplates: Add helper to ensure all templates have a test-case associated

* UnifiedStorage: Add missing sql template test case

* LegacyDashboards: Add sql templates fs to test cases for exhaustiveness check

* RBACStore: Add sql templates fs to test cases for exhaustiveness check

* LegacyIAM: Add missing sql template test cases

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

@@ -30,7 +30,8 @@ func TestDashboardQueries(t *testing.T) {
 	}
 
 	mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{
-		RootDir: "testdata",
+		RootDir:        "testdata",
+		SQLTemplatesFS: sqlTemplatesFS,
 		Templates: map[*template.Template][]mocks.TemplateTestCase{
 			sqlQueryDashboards: {
 				{

pkg/registry/apis/iam/legacy/service_account.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	claims "github.com/grafana/authlib/types"
+
 	"github.com/grafana/grafana/pkg/registry/apis/iam/common"
 	"github.com/grafana/grafana/pkg/storage/legacysql"
 	"github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
@@ -231,6 +232,10 @@ type listServiceAccountTokensQuery struct {
 	OrgUserTable string
 }
 
+func (listServiceAccountTokensQuery) Validate() error {
+	return nil // TODO
+}
+
 func (s *legacySQLStore) ListServiceAccountTokens(ctx context.Context, ns claims.NamespaceInfo, query ListServiceAccountTokenQuery) (*ListServiceAccountTokenResult, error) {
 	// for continue
 	query.Pagination.Limit += 1

pkg/registry/apis/iam/legacy/sql_test.go

@@ -54,8 +54,21 @@ func TestIdentityQueries(t *testing.T) {
 		return &v
 	}
 
+	listServiceAccounts := func(q *ListServiceAccountsQuery) sqltemplate.SQLTemplate {
+		v := newListServiceAccounts(nodb, q)
+		v.SQLTemplate = mocks.NewTestingSQLTemplate()
+		return &v
+	}
+
+	listServiceAccountTokens := func(q *ListServiceAccountTokenQuery) sqltemplate.SQLTemplate {
+		v := newListServiceAccountTokens(nodb, q)
+		v.SQLTemplate = mocks.NewTestingSQLTemplate()
+		return &v
+	}
+
 	mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{
-		RootDir: "testdata",
+		RootDir:        "testdata",
+		SQLTemplatesFS: sqlTemplatesFS,
 		Templates: map[*template.Template][]mocks.TemplateTestCase{
 			sqlQueryTeamsTemplate: {
 				{
@@ -192,6 +205,101 @@ func TestIdentityQueries(t *testing.T) {
 					}),
 				},
 			},
+			sqlQueryUserInternalIDTemplate: {
+				{
+					Name: "user_internal_id",
+					Data: &getUserInternalIDQuery{
+						SQLTemplate:  mocks.NewTestingSQLTemplate(),
+						UserTable:    nodb.Table("user"),
+						OrgUserTable: nodb.Table("org_user"),
+						Query: &GetUserInternalIDQuery{
+							UID:   "user-1",
+							OrgID: 1,
+						},
+					},
+				},
+			},
+			sqlQueryTeamInternalIDTemplate: {
+				{
+					Name: "team_internal_id",
+					Data: &getTeamInternalIDQuery{
+						SQLTemplate: mocks.NewTestingSQLTemplate(),
+						TeamTable:   nodb.Table("team"),
+						Query: &GetTeamInternalIDQuery{
+							UID:   "team-1",
+							OrgID: 1,
+						},
+					},
+				},
+			},
+			sqlQueryServiceAccountInternalIDTemplate: {
+				{
+					Name: "basic",
+					Data: &getServiceAccountInternalIDQuery{
+						SQLTemplate:  mocks.NewTestingSQLTemplate(),
+						UserTable:    nodb.Table("user"),
+						OrgUserTable: nodb.Table("org_user"),
+						Query: &GetServiceAccountInternalIDQuery{
+							OrgID: 1,
+							UID:   "sa-1",
+						},
+					},
+				},
+			},
+			sqlQueryServiceAccountsTemplate: {
+				{
+					Name: "service_accounts",
+					Data: listServiceAccounts(&ListServiceAccountsQuery{
+						UID:        "sa-1",
+						OrgID:      1,
+						Pagination: common.Pagination{Limit: 1},
+					}),
+				},
+				{
+					Name: "service_accounts_page_1",
+					Data: listServiceAccounts(&ListServiceAccountsQuery{
+						OrgID:      1,
+						Pagination: common.Pagination{Limit: 5},
+					}),
+				},
+				{
+					Name: "service_accounts_page_2",
+					Data: listServiceAccounts(&ListServiceAccountsQuery{
+						OrgID: 1,
+						Pagination: common.Pagination{
+							Limit:    1,
+							Continue: 2,
+						},
+					}),
+				},
+			},
+			sqlQueryServiceAccountTokensTemplate: {
+				{
+					Name: "service_account_tokens",
+					Data: listServiceAccountTokens(&ListServiceAccountTokenQuery{
+						UID:        "sa-1",
+						OrgID:      1,
+						Pagination: common.Pagination{Limit: 1},
+					}),
+				},
+				{
+					Name: "service_account_tokens_page_1",
+					Data: listServiceAccountTokens(&ListServiceAccountTokenQuery{
+						OrgID:      1,
+						Pagination: common.Pagination{Limit: 5},
+					}),
+				},
+				{
+					Name: "service_accounts_tokens_page_2",
+					Data: listServiceAccountTokens(&ListServiceAccountTokenQuery{
+						OrgID: 1,
+						Pagination: common.Pagination{
+							Limit:    1,
+							Continue: 2,
+						},
+					}),
+				},
+			},
 		},
 	})
 }

pkg/registry/apis/iam/legacy/testdata/mysql--service_account_internal_id-basic.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM `grafana`.`user` as u
+INNER JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'sa-1'
+AND u.is_service_account
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/mysql--service_account_tokens_query-service_account_tokens.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM `grafana`.`api_key` as t
+  INNER JOIN `grafana`.`user` as u ON t.service_account_id = u.id
+  INNER JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/mysql--service_account_tokens_query-service_account_tokens_page_1.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM `grafana`.`api_key` as t
+  INNER JOIN `grafana`.`user` as u ON t.service_account_id = u.id
+  INNER JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+ ORDER BY t.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/mysql--service_account_tokens_query-service_accounts_tokens_page_2.sql

@@ -0,0 +1,17 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM `grafana`.`api_key` as t
+  INNER JOIN `grafana`.`user` as u ON t.service_account_id = u.id
+  INNER JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+   AND t.id >= 2
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/mysql--service_accounts_query-service_accounts.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM `grafana`.`user` as u JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/mysql--service_accounts_query-service_accounts_page_1.sql

@@ -0,0 +1,12 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM `grafana`.`user` as u JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+ ORDER BY u.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/mysql--service_accounts_query-service_accounts_page_2.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM `grafana`.`user` as u JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.id >= 2
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/mysql--team_internal_id-team_internal_id.sql

@@ -0,0 +1,5 @@
+SELECT t.id
+FROM `grafana`.`team` as t
+WHERE t.org_id = 1
+AND t.uid = 'team-1'
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/mysql--user_internal_id-user_internal_id.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM `grafana`.`user` as u
+INNER JOIN `grafana`.`org_user` as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'user-1'
+AND NOT u.is_service_account
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/postgres--service_account_internal_id-basic.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM "grafana"."user" as u
+INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'sa-1'
+AND u.is_service_account
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/postgres--service_account_tokens_query-service_account_tokens.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/postgres--service_account_tokens_query-service_account_tokens_page_1.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+ ORDER BY t.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/postgres--service_account_tokens_query-service_accounts_tokens_page_2.sql

@@ -0,0 +1,17 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+   AND t.id >= 2
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/postgres--service_accounts_query-service_accounts.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/postgres--service_accounts_query-service_accounts_page_1.sql

@@ -0,0 +1,12 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+ ORDER BY u.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/postgres--service_accounts_query-service_accounts_page_2.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.id >= 2
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/postgres--team_internal_id-team_internal_id.sql

@@ -0,0 +1,5 @@
+SELECT t.id
+FROM "grafana"."team" as t
+WHERE t.org_id = 1
+AND t.uid = 'team-1'
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/postgres--user_internal_id-user_internal_id.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM "grafana"."user" as u
+INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'user-1'
+AND NOT u.is_service_account
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/sqlite--service_account_internal_id-basic.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM "grafana"."user" as u
+INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'sa-1'
+AND u.is_service_account
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/sqlite--service_account_tokens_query-service_account_tokens.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/sqlite--service_account_tokens_query-service_account_tokens_page_1.sql

@@ -0,0 +1,16 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+ ORDER BY t.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/sqlite--service_account_tokens_query-service_accounts_tokens_page_2.sql

@@ -0,0 +1,17 @@
+SELECT
+  t.id,
+  t.name,
+  t.is_revoked,
+  t.last_used_at,
+  t.expires,
+  t.created,
+  t.updated
+  FROM "grafana"."api_key" as t
+  INNER JOIN "grafana"."user" as u ON t.service_account_id = u.id
+  INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = ''
+   AND t.id >= 2
+ ORDER BY t.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/sqlite--service_accounts_query-service_accounts.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.uid = 'sa-1'
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/sqlite--service_accounts_query-service_accounts_page_1.sql

@@ -0,0 +1,12 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+ ORDER BY u.id asc
+ LIMIT 5

pkg/registry/apis/iam/legacy/testdata/sqlite--service_accounts_query-service_accounts_page_2.sql

@@ -0,0 +1,13 @@
+SELECT
+  u.id,
+  u.uid,
+  u.name,
+  u.is_disabled,
+  u.created,
+  u.updated
+  FROM "grafana"."user" as u JOIN "grafana"."org_user" as o ON u.id = o.user_id
+ WHERE o.org_id = 1
+   AND u.is_service_account
+   AND u.id >= 2
+ ORDER BY u.id asc
+ LIMIT 1

pkg/registry/apis/iam/legacy/testdata/sqlite--team_internal_id-team_internal_id.sql

@@ -0,0 +1,5 @@
+SELECT t.id
+FROM "grafana"."team" as t
+WHERE t.org_id = 1
+AND t.uid = 'team-1'
+LIMIT 1;

pkg/registry/apis/iam/legacy/testdata/sqlite--user_internal_id-user_internal_id.sql

@@ -0,0 +1,7 @@
+SELECT u.id
+FROM "grafana"."user" as u
+INNER JOIN "grafana"."org_user" as o ON u.id = o.user_id
+WHERE o.org_id = 1
+AND u.uid = 'user-1'
+AND NOT u.is_service_account
+LIMIT 1;

pkg/services/authz/rbac/store/sql_test.go

@@ -42,7 +42,8 @@ func TestIdentityQueries(t *testing.T) {
 	}
 
 	mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{
-		RootDir: "testdata",
+		RootDir:        "testdata",
+		SQLTemplatesFS: sqlTemplatesFS,
 		Templates: map[*template.Template][]mocks.TemplateTestCase{
 			sqlUserIdentifiers: {
 				{

pkg/storage/unified/sql/queries_test.go

@@ -12,7 +12,8 @@ import (
 
 func TestUnifiedStorageQueries(t *testing.T) {
 	mocks.CheckQuerySnapshots(t, mocks.TemplateTestSetup{
-		RootDir: "testdata",
+		RootDir:        "testdata",
+		SQLTemplatesFS: sqlTemplatesFS,
 		Templates: map[*template.Template][]mocks.TemplateTestCase{
 			sqlResourceDelete: {
 				{
@@ -335,6 +336,16 @@ func TestUnifiedStorageQueries(t *testing.T) {
 				},
 			},
 
+			sqlResourceVersionList: {
+				{
+					Name: "single path",
+					Data: &sqlResourceVersionListRequest{
+						SQLTemplate:          mocks.NewTestingSQLTemplate(),
+						groupResourceVersion: new(groupResourceVersion),
+					},
+				},
+			},
+
 			sqlResourceStats: {
 				{
 					Name: "global",

pkg/storage/unified/sql/sqltemplate/mocks/test_snapshots.go

@@ -2,6 +2,7 @@ package mocks
 
 import (
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	reflect "reflect"
@@ -10,6 +11,7 @@ import (
 	"text/template"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	sqltemplate "github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
@@ -82,6 +84,10 @@ type TemplateTestSetup struct {
 
 	// Check a set of templates against example inputs
 	Templates map[*template.Template][]TemplateTestCase
+
+	// The (embedded) filesystem containing the SQL query templates
+	// If not nil, a test will be run to ensure all templates in that folder have a test-case
+	SQLTemplatesFS fs.FS
 }
 
 func CheckQuerySnapshots(t *testing.T, setup TemplateTestSetup) {
@@ -96,6 +102,10 @@ func CheckQuerySnapshots(t *testing.T, setup TemplateTestSetup) {
 		}
 	}
 
+	if setup.SQLTemplatesFS != nil {
+		ensureAllTemplatesHaveTestCases(t, setup)
+	}
+
 	for tmpl, cases := range setup.Templates {
 		t.Run(tmpl.Name(), func(t *testing.T) {
 			t.Parallel()
@@ -146,3 +156,40 @@ func CheckQuerySnapshots(t *testing.T, setup TemplateTestSetup) {
 		})
 	}
 }
+
+func ensureAllTemplatesHaveTestCases(t *testing.T, setup TemplateTestSetup) {
+	t.Helper()
+
+	// Folder containing SQL query templates
+	sqlFiles := make([]string, 0, len(setup.Templates))
+	err := fs.WalkDir(setup.SQLTemplatesFS, ".", func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if d.IsDir() {
+			return nil
+		}
+
+		if name := d.Name(); strings.HasSuffix(name, ".sql") {
+			sqlFiles = append(sqlFiles, name)
+		}
+
+		return nil
+	})
+	require.NoError(t, err)
+
+	// Makes sure all SQL files in the folder have a test-case
+	for _, file := range sqlFiles {
+		found := false
+
+		for template := range setup.Templates {
+			if template.Name() == file {
+				found = true
+				break
+			}
+		}
+
+		assert.True(t, found, "File '%s' does not have a test case", file)
+	}
+}

pkg/storage/unified/sql/testdata/mysql--resource_version_list-single path.sql

@@ -0,0 +1,6 @@
+SELECT
+    `resource_version`,
+    `group`,
+    `resource`
+    FROM `resource_version`
+;

pkg/storage/unified/sql/testdata/postgres--resource_version_list-single path.sql

@@ -0,0 +1,6 @@
+SELECT
+    "resource_version",
+    "group",
+    "resource"
+    FROM "resource_version"
+;

pkg/storage/unified/sql/testdata/sqlite--resource_version_list-single path.sql

@@ -0,0 +1,6 @@
+SELECT
+    "resource_version",
+    "group",
+    "resource"
+    FROM "resource_version"
+;