Skip to content

Commit d340a01

Browse files
committed
Fixes query to avoid reliance on new SQL 2017 STRING_AGG function
1 parent 60eccd1 commit d340a01

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2410,15 +2410,19 @@ public IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int framework
24102410
else
24112411
{
24122412
return connection.Query<BulkCompetency>(
2413-
@"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STRING_AGG(f.FlagName, ', ') AS FlagsCsv
2414-
FROM Flags AS f RIGHT OUTER JOIN
2415-
CompetencyFlags AS cf ON f.ID = cf.FlagID RIGHT OUTER JOIN
2413+
@"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
2414+
SELECT ', ' + f.FlagName
2415+
FROM Flags AS f
2416+
INNER JOIN CompetencyFlags AS cf ON f.ID = cf.FlagID
2417+
WHERE cf.CompetencyID = c.ID
2418+
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
2419+
FROM
24162420
Competencies AS c INNER JOIN
24172421
FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
24182422
FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID INNER JOIN
2419-
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID ON cf.CompetencyID = c.ID
2423+
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
24202424
WHERE (fc.FrameworkID = @frameworkId)
2421-
GROUP BY fc.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
2425+
GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
24222426
ORDER BY fcg.Ordering, fc.Ordering",
24232427
new { frameworkId }
24242428
);

0 commit comments

Comments
 (0)