Fix bug with rare case when certain statements fit into exactly one c…

…all.
overload-development-community · Apr 1, 2021 · e0db8d6 · e0db8d6
1 parent 445877d
commit e0db8d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/database/challenge.js b/src/database/challenge.js
@@ -1685,7 +1685,8 @@ class ChallengeDb {
             id: {type: Db.INT, value: challenge.id}
         };
 
-        let sqlTerms = [];
+        let hasData = false,
+            sqlTerms = [];
 
         for (const stat of damage) {
             const index = damage.indexOf(stat);
@@ -1700,6 +1701,7 @@ class ChallengeDb {
             params[`opponentPlayer${index}Id`] = {type: Db.INT, value: playerIds[stat.opponentDiscordId]};
             params[`weapon${index}`] = {type: Db.VARCHAR(50), value: stat.weapon};
             params[`damage${index}`] = {type: Db.FLOAT, value: stat.damage};
+            hasData = true;
 
             if (Object.keys(params).length > 2000) {
                 await db.query(`${sql} ${sqlTerms.join(",")}`, params);
@@ -1710,10 +1712,13 @@ class ChallengeDb {
                     id: {type: Db.INT, value: challenge.id}
                 };
                 sqlTerms = [];
+                hasData = false;
             }
         }
 
-        await db.query(sql, params);
+        if (hasData) {
+            await db.query(sql, params);
+        }
     }
 
     //               #     ##                     ###

diff --git a/src/database/team.js b/src/database/team.js
@@ -1663,6 +1663,8 @@ class TeamDb {
             params[`rating${index}`] = {type: Db.FLOAT, value: rating};
         }
 
+        let hasData = false;
+
         for (const {challengeId, challengeRating, index} of Object.keys(challengeRatings).map((r, i) => ({challengeId: +r, challengeRating: challengeRatings[+r], index: i}))) {
             sql = /* sql */`
                 ${sql}
@@ -1678,15 +1680,19 @@ class TeamDb {
             params[`challengedTeamRating${index}`] = {type: Db.FLOAT, value: challengeRating.challengedTeamRating};
             params[`ratingChange${index}`] = {type: Db.FLOAT, value: challengeRating.change};
             params[`challenge${index}Id`] = {type: Db.INT, value: challengeId};
+            hasData = true;
 
             if (Object.keys(params).length > 2000) {
                 await db.query(sql, params);
                 sql = "";
                 params = {};
+                hasData = false;
             }
         }
 
-        await db.query(sql, params);
+        if (hasData) {
+            await db.query(sql, params);
+        }
 
         await Cache.invalidate([`${settings.redisPrefix}:invalidate:challenge:closed`]);
     }