sqlc.embed

aslilac · aslilac · commit 164f8d66ec83 · 2024-08-27T19:16:58.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -2659,13 +2659,7 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)
 		}
 
 		filtered = append(filtered, database.GetGroupsRow{
-			ID:                      group.ID,
-			Name:                    group.Name,
-			OrganizationID:          group.OrganizationID,
-			AvatarURL:               group.AvatarURL,
-			QuotaAllowance:          group.QuotaAllowance,
-			DisplayName:             group.DisplayName,
-			Source:                  group.Source,
+			Group:                   group,
 			OrganizationDisplayName: orgDisplayName,
 		})
 	}
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/groups.sql b/coderd/database/queries/groups.sql
@@ -22,7 +22,7 @@ LIMIT
 
 -- name: GetGroups :many
 SELECT
-		groups.*, organizations.display_name AS organization_display_name
+		sqlc.embed(groups), organizations.display_name AS organization_display_name
 FROM
 		groups
 INNER JOIN
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -669,15 +669,15 @@ func ConvertUser(dbUser database.User) User {
 	}
 }
 
-func ConvertGroup(group database.Group) Group {
+func ConvertGroup(row database.GetGroupsRow) Group {
 	return Group{
-		ID:             group.ID,
-		Name:           group.Name,
-		OrganizationID: group.OrganizationID,
-		AvatarURL:      group.AvatarURL,
-		QuotaAllowance: group.QuotaAllowance,
-		DisplayName:    group.DisplayName,
-		Source:         group.Source,
+		ID:             row.Group.ID,
+		Name:           row.Group.Name,
+		OrganizationID: row.Group.OrganizationID,
+		AvatarURL:      row.Group.AvatarURL,
+		QuotaAllowance: row.Group.QuotaAllowance,
+		DisplayName:    row.Group.DisplayName,
+		Source:         row.Group.Source,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2659,13 +2659,7 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)`
`2659`	`2659`	`}`
`2660`	`2660`
`2661`	`2661`	`filtered = append(filtered, database.GetGroupsRow{`
`2662`		`- ID: group.ID,`
`2663`		`- Name: group.Name,`
`2664`		`- OrganizationID: group.OrganizationID,`
`2665`		`- AvatarURL: group.AvatarURL,`
`2666`		`- QuotaAllowance: group.QuotaAllowance,`
`2667`		`- DisplayName: group.DisplayName,`
`2668`		`- Source: group.Source,`
	`2662`	`+ Group: group,`
`2669`	`2663`	`OrganizationDisplayName: orgDisplayName,`
`2670`	`2664`	`})`
`2671`	`2665`	`}`
Original file line number	Diff line number	Diff line change
`@@ -669,15 +669,15 @@ func ConvertUser(dbUser database.User) User {`
`669`	`669`	`}`
`670`	`670`	`}`
`671`	`671`
`672`		`-func ConvertGroup(group database.Group) Group {`
	`672`	`+func ConvertGroup(row database.GetGroupsRow) Group {`
`673`	`673`	`return Group{`
`674`		`- ID: group.ID,`
`675`		`- Name: group.Name,`
`676`		`- OrganizationID: group.OrganizationID,`
`677`		`- AvatarURL: group.AvatarURL,`
`678`		`- QuotaAllowance: group.QuotaAllowance,`
`679`		`- DisplayName: group.DisplayName,`
`680`		`- Source: group.Source,`
	`674`	`+ ID: row.Group.ID,`
	`675`	`+ Name: row.Group.Name,`
	`676`	`+ OrganizationID: row.Group.OrganizationID,`
	`677`	`+ AvatarURL: row.Group.AvatarURL,`
	`678`	`+ QuotaAllowance: row.Group.QuotaAllowance,`
	`679`	`+ DisplayName: row.Group.DisplayName,`
	`680`	`+ Source: row.Group.Source,`
`681`	`681`	`}`
`682`	`682`	`}`
`683`	`683`