database fixes

build-logic/src/main/kotlin/WriteDependencies.kt

@@ -97,6 +97,9 @@ abstract class WriteDependencies : DefaultTask() {
   private fun MutableSet<ResolvedDependencyResult>.addFrom(dependencies: Set<DependencyResult>) {
     for (dependency in dependencies) {
       dependency as ResolvedDependencyResult
+      if (dependency.resolvedVariant.attributes.toString().contains("org.gradle.category=platform")) {
+        continue
+      }
       add(dependency)
       if (transitive.get()) {
         addFrom(dependency.selected.dependencies)

build-logic/src/main/kotlin/carbon.platform-conventions.gradle.kts

@@ -32,6 +32,12 @@ dependencies {
   runtimeDownload(libs.assistedInject) {
     isTransitive = false
   }
+  runtimeDownload(libs.flyway) {
+    exclude("com.google", "gson")
+  }
+  runtimeDownload(libs.flywayMysql) {
+    isTransitive = false
+  }
 }
 
 tasks {

build-logic/src/main/kotlin/extensions.kt

@@ -59,6 +59,8 @@ fun Task.standardRuntimeRelocations() {
   relocateDependency("org.mariadb.jdbc")
   relocateDependency("org.postgresql")
   relocateDependency("redis.clients.jedis")
+  relocateDependency("org.flywaydb")
+  relocateDependency("com.fasterxml")
 }
 
 /**
@@ -77,7 +79,6 @@ fun Task.standardRelocations() {
   relocateDependency("ninja.egg82.messenger")
   relocateDependency("org.antlr")
   relocateDependency("com.electronwill")
-  relocateDependency("org.flywaydb")
 }
 
 fun Task.relocateCloud() {

common/build.gradle.kts

@@ -36,8 +36,12 @@ dependencies {
   compileOnlyApi(libs.jdbiObject)
   compileOnlyApi(libs.jdbiPostgres)
   api(libs.hikariCP)
-  api(libs.flyway)
-  api(libs.flywayMysql)
+  compileOnlyApi(libs.flyway) {
+    exclude("com.google", "gson")
+  }
+  compileOnlyApi(libs.flywayMysql) {
+    isTransitive = false
+  }
 
   // Messaging
   api(libs.messenger)

common/src/main/java/net/draycia/carbon/common/users/CachingUserManager.java

@@ -36,6 +36,7 @@
 import net.draycia.carbon.common.messaging.packets.PacketFactory;
 import net.draycia.carbon.common.users.db.DatabaseUserManager;
 import net.draycia.carbon.common.util.ConcurrentUtil;
+import net.draycia.carbon.common.util.PlayerUtils;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -75,7 +76,14 @@ protected CachingUserManager(
     protected abstract void saveSync(CarbonPlayerCommon player);
 
     private CompletableFuture<Void> save(final CarbonPlayerCommon player) {
-        return CompletableFuture.runAsync(() -> this.saveSync(player), this.executor);
+        return CompletableFuture.runAsync(() -> {
+            this.saveSync(player);
+            player.saved();
+            this.messagingManager.get().withPacketService(packetService -> {
+                packetService.queuePacket(this.packetFactory.saveCompletedPacket(player.uuid()));
+                packetService.flushQueue();
+            });
+        }, this.executor);
     }
 
     @Override
@@ -93,13 +101,7 @@ public CompletableFuture<Void> saveIfNeeded(final CarbonPlayerCommon player) {
         if (!player.needsSave()) {
             return CompletableFuture.completedFuture(null);
         }
-        return this.save(player).whenComplete(($, $$) -> {
-            player.saved();
-            this.messagingManager.get().withPacketService(packetService -> {
-                packetService.queuePacket(this.packetFactory.saveCompletedPacket(player.uuid()));
-                packetService.flushQueue();
-            });
-        });
+        return this.save(player);
     }
 
     @Override
@@ -111,7 +113,8 @@ public CompletableFuture<CarbonPlayerCommon> user(final UUID uuid) {
                     final CarbonPlayerCommon player = this.loadOrCreate(uuid);
                     this.playerInjector.injectMembers(player);
                     if (this instanceof DatabaseUserManager) {
-                        player.registerPropertyUpdateListener(() -> this.save(player));
+                        player.registerPropertyUpdateListener(() ->
+                            this.save(player).exceptionally(PlayerUtils.saveExceptionHandler(this.logger, player.username, uuid)));
                     }
                     return player;
                 }, this.executor);

common/src/main/java/net/draycia/carbon/common/users/CarbonPlayerCommon.java

@@ -83,7 +83,7 @@ public CarbonPlayerCommon(
         final boolean muted,
         final boolean deafened,
         final @Nullable Key selectedChannel,
-        final String username,
+        final @Nullable String username, // will be resolved when requested
         final UUID uuid,
         final @Nullable Component displayName,
         final @Nullable UUID lastWhisperTarget,

common/src/main/java/net/draycia/carbon/common/users/db/DatabaseUserManager.java

@@ -21,6 +21,8 @@
 
 import com.google.inject.MembersInjector;
 import com.google.inject.Provider;
+import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import net.draycia.carbon.api.channels.ChannelRegistry;
 import net.draycia.carbon.common.messaging.MessagingManager;
@@ -34,7 +36,6 @@
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.core.statement.PreparedBatch;
-import org.jdbi.v3.core.statement.Update;
 
 @DefaultQualifier(NonNull.class)
 public abstract class DatabaseUserManager extends CachingUserManager {
@@ -67,33 +68,46 @@ protected DatabaseUserManager(
 
     @Override
     public final void saveSync(final CarbonPlayerCommon player) {
-        this.jdbi.withHandle(handle -> {
-            this.bindPlayerArguments(handle.createUpdate(this.locator.query("save-player")), player)
+        this.jdbi.useTransaction(handle -> {
+            handle.createUpdate(this.locator.query("insert-player"))
+                .bind("id", player.uuid())
+                .bind("muted", player.muted())
+                .bind("deafened", player.deafened())
+                .bind("selectedchannel", player.selectedChannelKey())
+                .bind("username", player.username()) // todo remove from db?
+                .bind("displayname", player.displayNameRaw())
+                .bind("lastwhispertarget", player.lastWhisperTarget())
+                .bind("whisperreplytarget", player.whisperReplyTarget())
+                .bind("spying", player.spying())
                 .execute();
 
-            if (!player.ignoredPlayers().isEmpty()) {
-                final PreparedBatch batch = handle.prepareBatch(this.locator.query("save-ignores"));
+            handle.createUpdate(this.locator.query("clear-ignores"))
+                .bind("id", player.uuid())
+                .execute();
+            handle.createUpdate(this.locator.query("clear-leftchannels"))
+                .bind("id", player.uuid())
+                .execute();
 
-                for (final UUID ignoredPlayer : player.ignoredPlayers()) {
+            final Set<UUID> ignored = player.ignoredPlayers();
+            if (!ignored.isEmpty()) {
+                final PreparedBatch batch = handle.prepareBatch(this.locator.query("save-ignores"));
+                for (final UUID ignoredPlayer : ignored) {
                     batch.bind("id", player.uuid()).bind("ignoredplayer", ignoredPlayer).add();
                 }
-
                 batch.execute();
             }
-            if (!player.leftChannels().isEmpty()) {
-                final PreparedBatch batch = handle.prepareBatch(this.locator.query("save-leftchannels"));
 
-                for (final Key leftChannel : player.leftChannels()) {
+            final List<Key> left = player.leftChannels();
+            if (!left.isEmpty()) {
+                final PreparedBatch batch = handle.prepareBatch(this.locator.query("save-leftchannels"));
+                for (final Key leftChannel : left) {
                     batch.bind("id", player.uuid()).bind("channel", leftChannel).add();
                 }
-
                 batch.execute();
             }
-            // TODO: save ignoredplayers
-            return null;
+
+            handle.commit();
         });
     }
 
-    abstract protected Update bindPlayerArguments(final Update update, final CarbonPlayerCommon player);
-
 }

common/src/main/java/net/draycia/carbon/common/users/db/mysql/MySQLPlayerRowMapper.java

@@ -45,7 +45,7 @@ public CarbonPlayerCommon map(final ResultSet rs, final StatementContext ctx) th
             rs.getBoolean("muted"),
             rs.getBoolean("deafened"),
             selectedChannel == null ? null : Key.key(selectedChannel),
-            Strings.trim(rs.getString("username")),
+            null,
             UUID.fromString(id),
             displayName == null ? null : GsonComponentSerializer.gson().deserialize(displayName),
             lastWhisperTarget == null ? null : UUID.fromString(lastWhisperTarget),

common/src/main/java/net/draycia/carbon/common/users/db/mysql/MySQLUserManager.java

@@ -51,7 +51,6 @@
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.flywaydb.core.Flyway;
 import org.jdbi.v3.core.Jdbi;
-import org.jdbi.v3.core.statement.Update;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
 @DefaultQualifier(NonNull.class)
@@ -110,20 +109,6 @@ protected CarbonPlayerCommon loadOrCreate(final UUID uuid) {
         });
     }
 
-    @Override
-    protected Update bindPlayerArguments(final Update update, final CarbonPlayerCommon player) {
-        return update
-            .bind("id", player.uuid())
-            .bind("muted", player.muted())
-            .bind("deafened", player.deafened())
-            .bind("selectedchannel", player.selectedChannelKey())
-            .bind("username", player.username())
-            .bind("displayname", player.displayNameRaw())
-            .bind("lastwhispertarget", player.lastWhisperTarget())
-            .bind("whisperreplytarget", player.whisperReplyTarget())
-            .bind("spying", player.spying());
-    }
-
     public static final class Factory {
 
         private final DatabaseSettings databaseSettings;

common/src/main/java/net/draycia/carbon/common/users/db/postgresql/PostgreSQLPlayerRowMapper.java

@@ -42,7 +42,7 @@ public CarbonPlayerCommon map(final ResultSet rs, final StatementContext ctx) th
             rs.getBoolean("muted"),
             rs.getBoolean("deafened"),
             selectedChannel == null ? null : Key.key(selectedChannel),
-            Strings.trim(rs.getString("username")),
+            null,
             rs.getObject("id", UUID.class),
             displayName == null ? null : GsonComponentSerializer.gson().deserialize(displayName),
             rs.getObject("lastwhispertarget", UUID.class),

common/src/main/java/net/draycia/carbon/common/users/db/postgresql/PostgreSQLUserManager.java

@@ -49,10 +49,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.flywaydb.core.Flyway;
-import org.flywaydb.core.internal.database.postgresql.PostgreSQLDatabaseType;
-import org.flywaydb.core.internal.plugin.PluginRegister;
 import org.jdbi.v3.core.Jdbi;
-import org.jdbi.v3.core.statement.Update;
 import org.jdbi.v3.postgres.PostgresPlugin;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
@@ -113,20 +110,6 @@ protected CarbonPlayerCommon loadOrCreate(final UUID uuid) {
         });
     }
 
-    @Override
-    protected Update bindPlayerArguments(final Update update, final CarbonPlayerCommon player) {
-        return update
-            .bind("id", player.uuid())
-            .bind("muted", player.muted())
-            .bind("deafened", player.deafened())
-            .bind("selectedchannel", player.selectedChannelKey())
-            .bind("username", player.username())
-            .bind("displayname", player.displayNameRaw())
-            .bind("lastwhispertarget", player.lastWhisperTarget())
-            .bind("whisperreplytarget", player.whisperReplyTarget())
-            .bind("spying", player.spying());
-    }
-
     public static final class Factory {
 
         private final DatabaseSettings databaseSettings;
@@ -158,7 +141,6 @@ private Factory(
 
         public PostgreSQLUserManager create() {
             SQLDrivers.loadFrom(this.getClass().getClassLoader());
-            PluginRegister.REGISTERED_PLUGINS.add(new PostgreSQLDatabaseType());
 
             final HikariConfig hikariConfig = new HikariConfig();
             hikariConfig.setMaximumPoolSize(20);
@@ -169,15 +151,17 @@ public PostgreSQLUserManager create() {
 
             final DataSource dataSource = new HikariDataSource(hikariConfig);
 
-            Flyway.configure(CarbonChat.class.getClassLoader())
+            final Flyway flyway = Flyway.configure(CarbonChat.class.getClassLoader())
                 .baselineVersion("0")
                 .baselineOnMigrate(true)
                 .locations("queries/migrations/postgresql")
                 .dataSource(dataSource)
                 .validateMigrationNaming(true)
                 .validateOnMigrate(true)
-                .load()
-                .migrate();
+                .load();
+
+            flyway.repair();
+            flyway.migrate();
 
             final Jdbi jdbi = Jdbi.create(dataSource)
                 .registerArgument(new ComponentArgumentFactory())

common/src/main/java/net/draycia/carbon/common/util/PlayerUtils.java

@@ -67,7 +67,7 @@ public static <C extends CarbonPlayer> CompletableFuture<Void> savePlayer(
 
     public static Function<Throwable, @Nullable Void> saveExceptionHandler(final Logger logger, final String username, final UUID uuid) {
         return thr -> {
-            logger.warn("Exception saving data for player {} with uuid {}", username, uuid);
+            logger.warn("Exception saving data for player {} with uuid {}", username, uuid, thr);
             return null;
         };
     }

common/src/main/resources/queries/migrations/mysql/V1__create_tables.sql

@@ -2,9 +2,9 @@ CREATE TABLE carbon_users (
     `id` BINARY(16) NOT NULL PRIMARY KEY,
     `muted` BOOLEAN,
     `deafened` BOOLEAN,
-    `selectedchannel` varchar(256),
-    `username` varchar(20),
-    `displayname` varchar(1024),
+    `selectedchannel` VARCHAR(256),
+    `username` VARCHAR(20),
+    `displayname` VARCHAR(1024),
     `lastwhispertarget` BINARY(16),
     `whisperreplytarget` BINARY(16),
     `spying` BOOLEAN

common/src/main/resources/queries/migrations/mysql/V3__fix_leftchannels.sql

@@ -0,0 +1,6 @@
+DROP TABLE carbon_leftchannels;
+CREATE TABLE carbon_leftchannels (
+    `id` BINARY(16) NOT NULL,
+    `channel` VARCHAR(256) NOT NULL,
+    PRIMARY KEY (id, channel)
+);

common/src/main/resources/queries/migrations/postgresql/V1__create_tables.sql

@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS carbon_users (
+CREATE TABLE carbon_users (
     id uuid NOT NULL PRIMARY KEY,
     muted BOOLEAN,
     deafened BOOLEAN,
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS carbon_users (
     spying BOOLEAN
 );
 
-CREATE TABLE IF NOT EXISTS carbon_ignores (
+CREATE TABLE carbon_ignores (
     id uuid NOT NULL,
     ignoredplayer uuid NOT NULL,
     PRIMARY KEY (id, ignoredplayer)

common/src/main/resources/queries/migrations/postgresql/V2__create_tables.sql

@@ -1,5 +1,5 @@
-CREATE TABLE IF NOT EXISTS carbon_leftchannels (
+CREATE TABLE carbon_leftchannels (
     id uuid NOT NULL,
-    channel varchar(100) NOT NULL,
+    channel VARCHAR(100) NOT NULL,
     PRIMARY KEY (id, channel)
 );

common/src/main/resources/queries/migrations/postgresql/V3__fix_leftchannels.sql

@@ -0,0 +1 @@
+ALTER TABLE carbon_leftchannels ALTER COLUMN channel TYPE VARCHAR(256) NOT NULL;

common/src/main/resources/queries/mysql/clear-ignores.sql

@@ -0,0 +1 @@
+DELETE FROM carbon_ignores WHERE (id = UNHEX(REPLACE(:id, '-', '')));

common/src/main/resources/queries/mysql/clear-leftchannels.sql

@@ -0,0 +1 @@
+DELETE FROM carbon_leftchannels WHERE (id = UNHEX(REPLACE(:id, '-', '')));

common/src/main/resources/queries/mysql/insert-player.sql

@@ -1,11 +1,21 @@
-INSERT INTO carbon_users VALUES (
-    UNHEX(REPLACE(:id, '-', '')),
-    :muted,
-    :deafened,
-    :selectedchannel,
-    :username,
-    :displayname,
-    UNHEX(REPLACE(:lastwhispertarget, '-', '')),
-    UNHEX(REPLACE(:whisperreplytarget, '-', '')),
-    :spying
-);
+INSERT INTO carbon_users SET
+    id = UNHEX(REPLACE(:id, '-', '')),
+    muted = :muted,
+    deafened = :deafened,
+    selectedchannel = :selectedchannel,
+    username= :username,
+    displayname = :displayname,
+    lastwhispertarget = UNHEX(REPLACE(:lastwhispertarget, '-', '')),
+    whisperreplytarget = UNHEX(REPLACE(:whisperreplytarget, '-', '')),
+    spying = :spying
+ON DUPLICATE KEY UPDATE
+    id = UNHEX(REPLACE(:id, '-', '')),
+    muted = :muted,
+    deafened = :deafened,
+    selectedchannel = :selectedchannel,
+    username= :username,
+    displayname = :displayname,
+    lastwhispertarget = UNHEX(REPLACE(:lastwhispertarget, '-', '')),
+    whisperreplytarget = UNHEX(REPLACE(:whisperreplytarget, '-', '')),
+    spying = :spying
+;