From 34873914bd30ba00a861b61e8c68d8486afeabec Mon Sep 17 00:00:00 2001 From: Zeromaniac <94971971+ZeromaniacMc@users.noreply.github.com> Date: Fri, 8 Apr 2022 21:35:40 +0200 Subject: [PATCH] Show sql table prefix if set in '/lp info' (#3360) --- .../implementation/mongodb/MongoStorage.java | 7 +++++++ .../storage/implementation/sql/SqlStorage.java | 13 ++++++++++++- .../sql/connection/ConnectionFactory.java | 3 ++- .../connection/file/FlatfileConnectionFactory.java | 5 ++++- common/src/main/resources/luckperms_en.properties | 2 ++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java index 3320dc534..916dfae57 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java @@ -173,6 +173,13 @@ public class MongoStorage implements StorageImplementation { Message.formatBoolean(success) ); + if (!this.prefix.isEmpty()) { + meta.put( + Component.translatable("luckperms.command.info.storage.meta.collection-prefix-key"), + Component.text(this.prefix) + ); + } + return meta; } diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java index 30f839ac4..ba2d4ce72 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java @@ -34,6 +34,7 @@ import me.lucko.luckperms.common.actionlog.LoggedAction; import me.lucko.luckperms.common.bulkupdate.BulkUpdate; import me.lucko.luckperms.common.bulkupdate.BulkUpdateStatistics; import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder; +import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.context.serializer.ContextSetJsonSerializer; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.Track; @@ -230,7 +231,17 @@ public class SqlStorage implements StorageImplementation { @Override public Map getMeta() { - return this.connectionFactory.getMeta(); + Map meta = this.connectionFactory.getMeta(); + + String tablePrefix = this.plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX); + if (!tablePrefix.equals("luckperms_")) { + meta.put( + Component.translatable("luckperms.command.info.storage.meta.table-prefix-key"), + Component.text(tablePrefix) + ); + } + + return meta; } @Override diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java index 27e84bcd4..36014e1c9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/ConnectionFactory.java @@ -32,6 +32,7 @@ import net.kyori.adventure.text.Component; import java.sql.Connection; import java.sql.SQLException; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; @@ -44,7 +45,7 @@ public interface ConnectionFactory { void shutdown() throws Exception; default Map getMeta() { - return Collections.emptyMap(); + return new LinkedHashMap<>(); } Function getStatementProcessor(); diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java index a80c7edee..368c34785 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/connection/file/FlatfileConnectionFactory.java @@ -37,6 +37,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.text.DecimalFormat; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -119,9 +120,11 @@ abstract class FlatfileConnectionFactory implements ConnectionFactory { fileSize = "0MB"; } - return Collections.singletonMap( + Map meta = new LinkedHashMap<>(); + meta.put( Component.translatable("luckperms.command.info.storage.meta.file-size-key"), Component.text(fileSize, NamedTextColor.GREEN) ); + return meta; } } diff --git a/common/src/main/resources/luckperms_en.properties b/common/src/main/resources/luckperms_en.properties index 6ce54db35..a0fb7cd47 100644 --- a/common/src/main/resources/luckperms_en.properties +++ b/common/src/main/resources/luckperms_en.properties @@ -151,6 +151,8 @@ luckperms.command.info.storage.meta.split-types-key=Types luckperms.command.info.storage.meta.ping-key=Ping luckperms.command.info.storage.meta.connected-key=Connected luckperms.command.info.storage.meta.file-size-key=File Size +luckperms.command.info.storage.meta.table-prefix-key=Table Prefix +luckperms.command.info.storage.meta.collection-prefix-key=Collection Prefix luckperms.command.info.extensions-key=Extensions luckperms.command.info.messaging-key=Messaging luckperms.command.info.instance-key=Instance