Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-28 03:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQLStorage not using the table prefix

Browse Source
This commit is contained in:
Vankka 2022-04-12 11:50:49 +03:00
parent 02121a61f9
commit 0f13f155cb
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/com/discordsrv/common/storage/impl/sql/SQLStorage.java
View File

@ -69,19 +69,23 @@ public abstract class SQLStorage implements Storage {
}
}
protected String tablePrefix() {
return discordSRV.connectionConfig().storage.sqlTablePrefix;
}
@Override
public void initialize() {
useConnection((CheckedConsumer<Connection>) connection -> createTables(
connection,
discordSRV.connectionConfig().storage.sqlTablePrefix,
discordSRV.linkProvider() instanceof StorageLinker)
);
discordSRV.linkProvider() instanceof StorageLinker
));
}
@Override
public @Nullable Long getUserId(@NotNull UUID player) {
return useConnection(connection -> {
try (PreparedStatement statement = connection.prepareStatement("select USER_ID from LINKED_ACCOUNTS where PLAYER_UUID = ?;")) {
try (PreparedStatement statement = connection.prepareStatement("select USER_ID from " + tablePrefix() + "LINKED_ACCOUNTS where PLAYER_UUID = ?;")) {
statement.setString(1, player.toString());
try (ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
@ -96,7 +100,7 @@ public abstract class SQLStorage implements Storage {
@Override
public @Nullable UUID getPlayerUUID(long userId) {
return useConnection(connection -> {
try (PreparedStatement statement = connection.prepareStatement("select PLAYER_UUID from LINKED_ACCOUNTS where USER_ID = ?;")) {
try (PreparedStatement statement = connection.prepareStatement("select PLAYER_UUID from " + tablePrefix() + "LINKED_ACCOUNTS where USER_ID = ?;")) {
statement.setLong(1, userId);
try (ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
@ -115,7 +119,7 @@ public abstract class SQLStorage implements Storage {
@Override
public void createLink(@NotNull UUID player, long userId) {
useConnection(connection -> {
try (PreparedStatement statement = connection.prepareStatement("insert into LINKED_ACCOUNTS (PLAYER_UUID, USER_ID) values (?, ?);")) {
try (PreparedStatement statement = connection.prepareStatement("insert into " + tablePrefix() + "LINKED_ACCOUNTS (PLAYER_UUID, USER_ID) values (?, ?);")) {
statement.setString(1, player.toString());
statement.setLong(2, userId);
@ -128,7 +132,7 @@ public abstract class SQLStorage implements Storage {
public int getLinkedAccountCount() {
return useConnection(connection -> {
try (Statement statement = connection.createStatement()) {
try (ResultSet resultSet = statement.executeQuery("select count(*) from LINKED_ACCOUNTS;")) {
try (ResultSet resultSet = statement.executeQuery("select count(*) from " + tablePrefix() + "LINKED_ACCOUNTS;")) {
if (resultSet.next()) {
return resultSet.getInt(1);
}