WITH messi_ronaldo_match_player_stats as 
(SELECT p.name as player, STRPTIME(p.date_of_birth, '%Y-%m-%d') as date_of_birth, t.name as team, s.season_label as season, c.name as competition, m.date as match_date, home_teams.name as home_team, away_teams.name as away_team, mps.*
FROM @blt.ultimate_soccer_dataset.match_player_stats mps
     INNER JOIN @blt.ultimate_soccer_dataset.matches m on (mps.match_id = m.match_id)
     INNER JOIN @blt.ultimate_soccer_dataset.players p on (mps.player_id = p.player_id)
     INNER JOIN @blt.ultimate_soccer_dataset.teams t on (mps.team_id = t.team_id)
     INNER JOIN @blt.ultimate_soccer_dataset.seasons s on (m.season_id = s.season_id)
     INNER JOIN @blt.ultimate_soccer_dataset.competitions c on (s.competition_id = c.competition_id)
     INNER JOIN @blt.ultimate_soccer_dataset.teams home_teams ON (m.home_team_id = home_teams.team_id)
     INNER JOIN @blt.ultimate_soccer_dataset.teams away_teams ON (m.away_team_id = away_teams.team_id)
WHERE p.player_id IN ('5446de4b-66b8-5627-990a-49e14dbe4e6d', -- L. Messi
                      '5b578ccf-496a-5afb-bea2-c7ece1b2c05b') -- Cristiano Ronaldo 
      and year(m.date) >= 2015
)
SELECT
  player,
  COUNT(DISTINCT match_date) AS matches,
  COUNT(DISTINCT match_date) FILTER (WHERE goals_scored > 0) AS matches_with_goals,
  ROUND(100*matches_with_goals / matches) as scoring_rate
FROM messi_ronaldo_match_player_stats
WHERE minutes_played > 0
GROUP BY 1