From 403ee891d55eec802182d3215447e30e2b418f76 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 13 Jan 2019 18:19:00 -0700
Subject: [PATCH] Change column name, drop a useless one

---
 config/achievements.hjson | 2 +-
 core/achievement.js       | 8 ++++----
 core/database.js          | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 63ea5ee1..d5099f8c 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -70,7 +70,7 @@
                     points: 5
                 }
                 25: {
-                    title: "Inquisitive Caller"
+                    title: "Inquisitive"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 10
diff --git a/core/achievement.js b/core/achievement.js
index f57e2f06..333b968c 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -180,7 +180,7 @@ class Achievements {
         UserDb.get(
             `SELECT COUNT() AS count
             FROM user_achievement
-            WHERE user_id = ? AND achievement_tag = ? AND match_field = ?;`,
+            WHERE user_id = ? AND achievement_tag = ? AND match = ?;`,
             [ user.userId, achievementTag, field],
             (err, row) => {
                 return cb(err, row ? row.count : 0);
@@ -193,9 +193,9 @@ class Achievements {
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
 
         UserDb.run(
-            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match_field, match_value)
-            VALUES (?, ?, ?, ?, ?);`,
-            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField, info.matchValue ],
+            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match)
+            VALUES (?, ?, ?, ?);`,
+            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField ],
             err => {
                 if(err) {
                     return cb(err);
diff --git a/core/database.js b/core/database.js
index 371af1ae..a6af1930 100644
--- a/core/database.js
+++ b/core/database.js
@@ -194,9 +194,8 @@ const DB_INIT_TABLE = {
                 user_id             INTEGER NOT NULL,
                 achievement_tag     VARCHAR NOT NULL,
                 timestamp           DATETIME NOT NULL,
-                match_field         VARCHAR NOT NULL,
-                match_value         VARCHAR NOT NULL,
-                UNIQUE(user_id, achievement_tag, match_field),
+                match               VARCHAR NOT NULL,
+                UNIQUE(user_id, achievement_tag, match),
                 FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
             );`
         );