Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs =================================================================== diff -u -r32e9b5ed73b6c798055ab4c87c4db703fb3d866e -r1d8c35ad08fddf6471c168876fc01552af29fd6a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 32e9b5ed73b6c798055ab4c87c4db703fb3d866e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 1d8c35ad08fddf6471c168876fc01552af29fd6a) @@ -39,18 +39,18 @@ private readonly string query = $"SELECT Value as {waveHeightColumn}," + $"(case when SubMechanismId is 102 then 1 else 0 end) as {isOvertoppingDominantColumn} FROM " + - "(SELECT d.OuterIterationId, d.PeriodId, BetaValue, ClosingSituation, WindDirection, LevelType, SubMechanismId " + + "(SELECT d.OuterIterationId, d.PeriodId, BetaValue, ClosingSituationId, d.WindDirectionId, LevelTypeId, SubMechanismId " + "FROM GoverningWind g " + - "JOIN DesignBeta d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + - $"WHERE LevelType = 7 AND d.SubMechanismId = 102 AND SectionId = {sectionIdParameterName} " + + "JOIN DesignBeta d ON d.WindDirectionId = g.WindDirectionId AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + + $"WHERE LevelTypeId = 7 AND d.SubMechanismId = 102 AND SectionId = {sectionIdParameterName} " + "ORDER BY d.OuterIterationId DESC, d.PeriodId, BetaValue " + "LIMIT 1) as g " + "JOIN " + "(SELECT Value FROM GoverningWind g " + - "JOIN DesignPointResults d ON d.WindDirection = g.GoverningWind AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + - "JOIN DesignBeta db ON db.WindDirection = d.WindDirection AND db.ClosingSituation = d.ClosingSituation AND db.OuterIterationId = d.OuterIterationId " + + "JOIN DesignPointResults d ON d.WindDirectionId = g.WindDirectionId AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " + + "JOIN DesignBeta db ON db.WindDirectionId = d.WindDirectionId AND db.ClosingSituationId = d.ClosingSituationId AND db.OuterIterationId = d.OuterIterationId " + "AND db.PeriodId = d.PeriodId " + - $"WHERE OutputVarId = 3 AND db.LevelType = 7 AND db.SectionId = {sectionIdParameterName} " + + $"WHERE OutputVariableId = 3 AND db.LevelTypeId = 7 AND db.SectionId = {sectionIdParameterName} " + "ORDER BY d.OuterIterationId DESC, d.PeriodId, db.BetaValue " + "LIMIT 1) " + "Order By g.BetaValue " +