From 1771ed68a412bebaf7d3c88e0aa81429b79bd058 Mon Sep 17 00:00:00 2001
From: ZeldaZach <zahalpern+github@gmail.com>
Date: Sat, 1 Feb 2025 18:55:29 -0500
Subject: [PATCH] Support database changes

---
 servatrice/migrations/servatrice_0033_to_0034.sql |  8 ++++++++
 servatrice/servatrice.sql                         |  7 +++++--
 servatrice/src/servatrice_database_interface.cpp  | 12 +++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 servatrice/migrations/servatrice_0033_to_0034.sql

diff --git a/servatrice/migrations/servatrice_0033_to_0034.sql b/servatrice/migrations/servatrice_0033_to_0034.sql
new file mode 100644
index 000000000..19c33c2dc
--- /dev/null
+++ b/servatrice/migrations/servatrice_0033_to_0034.sql
@@ -0,0 +1,8 @@
+-- Servatrice db migration from version 33 to version 34
+
+ALTER TABLE cockatrice_users ADD COLUMN leftPawnColorOverride varchar(255);
+ALTER TABLE cockatrice_users ADD COLUMN rightPawnColorOverride varchar(255);
+
+ALTER TABLE cockatrice_users ADD INDEX `idx_pawnColorOverrides` (`leftPawnColorOverride`, `rightPawnColorOverride`);
+
+UPDATE cockatrice_schema_version SET version=34 WHERE version=33;
diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql
index f38fa67d0..fa644dbc0 100644
--- a/servatrice/servatrice.sql
+++ b/servatrice/servatrice.sql
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
   PRIMARY KEY  (`version`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
-INSERT INTO cockatrice_schema_version VALUES(33);
+INSERT INTO cockatrice_schema_version VALUES(34);
 
 -- users and user data tables
 CREATE TABLE IF NOT EXISTS `cockatrice_users` (
@@ -41,6 +41,8 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
   `privlevelStartDate` datetime NOT NULL,
   `privlevelEndDate` datetime NOT NULL,
   `passwordLastChangedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `leftPawnColorOverride` varchar(255),
+  `rightPawnColorOverride` varchar(255),
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`),
   KEY `token` (`token`),
@@ -48,7 +50,8 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
   INDEX `idx_admin` (`admin`),
   INDEX `idx_active` (`active`),
   INDEX `idx_privlevel` (`privlevel`),
-  INDEX `idx_clientid` (`clientid`)
+  INDEX `idx_clientid` (`clientid`),
+  INDEX `idx_pawnColorOverrides` (`leftPawnColorOverride`, `rightPawnColorOverride`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `cockatrice_decklist_files` (
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index 4ad61c6e4..bb7a5cc9a 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -607,6 +607,15 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer
 
     result.set_user_level(userLevel);
 
+    const auto &pawn_left_override = query->value(10).toString();
+    const auto &pawn_right_override = query->value(11).toString();
+    if (!pawn_left_override.isEmpty()) {
+        result.mutable_pawn_colors()->set_left_side(pawn_left_override.toStdString());
+    }
+    if (!pawn_right_override.isEmpty()) {
+        result.mutable_pawn_colors()->set_right_side(pawn_right_override.toStdString());
+    }
+
     const QString country = query->value(3).toString();
     if (!country.isEmpty())
         result.set_country(country.toStdString());
@@ -654,7 +663,8 @@ ServerInfo_User Servatrice_DatabaseInterface::getUserData(const QString &name, b
 
         QSqlQuery *query =
             prepareQuery("select id, name, admin, country, privlevel, realname, avatar_bmp, registrationDate, "
-                         "email, clientid from {prefix}_users where name = :name and active = 1");
+                         "email, clientid, leftPawnColorOverride, rightPawnColorOverride from {prefix}_users where "
+                         "name = :name and active = 1");
         query->bindValue(":name", name);
         if (!execSqlQuery(query))
             return result;