Commit 3feb0017 authored by Howl's avatar Howl
Browse files

Use INNER JOINs instead of LEFT JOINs, as they are safer.

parent 7fd4312c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ func opCacheData() {
		scores.score, scores.completed, scores.300_count,
		scores.100_count, scores.50_count
	FROM scores
	LEFT JOIN users ON users.id=scores.userid`
	INNER JOIN users ON users.id=scores.userid`
	rows, err := db.Query(fetchQuery)
	if err != nil {
		queryError(err, fetchQuery)
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ type ppUserMode struct {
func opCalculatePP() {
	defer wg.Done()

	const ppQuery = "SELECT scores.userid, pp, scores.play_mode FROM scores LEFT JOIN users ON users.id=scores.userid WHERE completed = '3' ORDER BY pp DESC"
	const ppQuery = "SELECT scores.userid, pp, scores.play_mode FROM scores INNER JOIN users ON users.id=scores.userid WHERE completed = '3' ORDER BY pp DESC"
	rows, err := db.Query(ppQuery)
	if err != nil {
		queryError(err, ppQuery)
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ func main() {
	if c.FixCompletedScores {
		fmt.Print("Starting fixing completed = 3 scores on not ranked beatmaps...")
		go op(`UPDATE scores
			LEFT JOIN beatmaps ON beatmaps.beatmap_md5 = scores.beatmap_md5
			INNER JOIN beatmaps ON beatmaps.beatmap_md5 = scores.beatmap_md5
			SET completed = '2'  
			WHERE
				beatmaps.ranked != '1' AND 
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ func opBuildLeaderboard() {
	}
	db.SetMaxOpenConns(1)
	db.SetMaxIdleConns(1)
	initQuery := "SELECT users_stats.id, pp_std, ranked_score_taiko, ranked_score_ctb, ranked_score_mania FROM users_stats LEFT JOIN users ON users.id = users_stats.id WHERE privileges & 1 > 0"
	initQuery := "SELECT users_stats.id, pp_std, ranked_score_taiko, ranked_score_ctb, ranked_score_mania FROM users_stats INNER JOIN users ON users.id = users_stats.id WHERE privileges & 1 > 0"
	rows, err := db.Query(initQuery)
	if err != nil {
		queryError(err, initQuery)