fixed query

ChristopherBThai · Jan 20, 2023 · ce869ad · ce869ad
1 parent 6598b38
commit ce869ad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/commands/commandList/ranking/top.js b/src/commands/commandList/ranking/top.js
@@ -887,12 +887,12 @@ function getShardRanking(globalRank, con, msg, count, p) {
 function getMarriageRanking(globalRank, con, msg, count, p) {
 	let sql;
 	if (globalRank) {
-		sql = 'SELECT uid1 AS id,uid2 AS id2,dailies FROM marriage ORDER BY dailies DESC LIMIT ' + count + ';';
-		sql += 'SELECT uid1 AS id,uid2 AS id2,dailies,(SELECT COUNT(*)+1 FROM marriage WHERE dailies > u.dailies ) AS rank FROM marriage u WHERE u.uid1 = ' + msg.author.id + ' OR u.uid2 = ' + msg.author.id + ';';
+		sql = 'SELECT u.id AS id,uu.id AS id2,dailies FROM marriage INNER JOIN user u ON uid1 = u.uid INNER JOIN user uu ON uid2 = uu.uid ORDER BY dailies DESC LIMIT ' + count + ';';
+		sql += 'SELECT u.id AS id,uu.id AS id2,dailies,(SELECT COUNT(*)+1 FROM marriage WHERE dailies > m.dailies ) AS rank FROM marriage m INNER JOIN user u ON uid1 = u.uid INNER JOIN user uu ON uid2 = uu.uid WHERE u.id = ' + msg.author.id + ' OR uu.id = ' + msg.author.id + ';';
 	} else {
 		let users = global.getids(msg.channel.guild.members);
-		sql = 'SELECT uid1 AS id,uid2 AS id2,dailies FROM marriage WHERE uid1 IN (' + users + ') OR uid2 IN (' + users + ') ORDER BY dailies DESC LIMIT ' + count + ';';
-		sql += 'SELECT uid1 AS id,uid2 AS id2,dailies,(SELECT COUNT(*)+1 FROM marriage WHERE (uid1 IN (' + users + ') OR uid2 IN (' + users + ')) AND dailies > u.dailies ) AS rank FROM marriage u WHERE u.uid1 = ' + msg.author.id + ' OR u.uid2 = ' + msg.author.id + ';';
+		sql = 'SELECT u.id AS id, uu.id AS id2, marriage.dailies FROM marriage INNER JOIN user u ON marriage.uid1 = u.uid INNER JOIN user uu ON marriage.uid2 = uu.uid WHERE u.id IN (' + users + ') OR uu.id IN (' + users + ') ORDER BY dailies DESC LIMIT ' + count + ';';
+		sql += 'SELECT u.id AS id, uu.id AS id2, m.dailies, (SELECT COUNT(*)+1 FROM marriage WHERE (u.id IN (' + users + ') OR uu.id IN (' + users + ')) AND dailies > m.dailies ) AS rank FROM marriage m INNER JOIN user u ON m.uid1 = u.uid INNER JOIN user uu ON m.uid2 = uu.uid WHERE u.id = ' + msg.author.id + ' OR uu.id = ' + msg.author.id + ';';
 	}
 
 	displayRanking(con, msg, count, globalRank, sql,