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

Move linked_accounts table name to constant, fixes mysql

Browse Source
This commit is contained in:
Vankka 2023-06-25 21:13:01 +03:00
parent 2eaaa17581
commit 7aa6191a27
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ import java.util.UUID;
public abstract class SQLStorage implements Storage {
protected static final String LINKED_ACCOUNTS_TABLE_NAME = "linked_accounts";
protected final DiscordSRV discordSRV;
public SQLStorage(DiscordSRV discordSRV) {
@ -83,7 +85,7 @@ public abstract class SQLStorage implements Storage {
@Override
public @Nullable Long getUserId(@NotNull UUID player) {
return useConnection(connection -> {
try (PreparedStatement statement = connection.prepareStatement("select USER_ID from " + tablePrefix() + "LINKED_ACCOUNTS where PLAYER_UUID = ?;")) {
try (PreparedStatement statement = connection.prepareStatement("select USER_ID from " + tablePrefix() + LINKED_ACCOUNTS_TABLE_NAME + " where PLAYER_UUID = ?;")) {
statement.setString(1, player.toString());
try (ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
@ -98,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 " + tablePrefix() + "LINKED_ACCOUNTS where USER_ID = ?;")) {
try (PreparedStatement statement = connection.prepareStatement("select PLAYER_UUID from " + tablePrefix() + LINKED_ACCOUNTS_TABLE_NAME + " where USER_ID = ?;")) {
statement.setLong(1, userId);
try (ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
@ -117,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 " + tablePrefix() + "LINKED_ACCOUNTS (PLAYER_UUID, USER_ID) values (?, ?);")) {
try (PreparedStatement statement = connection.prepareStatement("insert into " + tablePrefix() + LINKED_ACCOUNTS_TABLE_NAME + " (PLAYER_UUID, USER_ID) values (?, ?);")) {
statement.setString(1, player.toString());
statement.setLong(2, userId);
@ -129,7 +131,7 @@ public abstract class SQLStorage implements Storage {
@Override
public void removeLink(@NotNull UUID player, long userId) {
useConnection(connection -> {
try (PreparedStatement statement = connection.prepareStatement("delete " + tablePrefix() + "LINKED_ACCOUNTS where PLAYER_UUID = ?;")) {
try (PreparedStatement statement = connection.prepareStatement("delete " + tablePrefix() + LINKED_ACCOUNTS_TABLE_NAME + " where PLAYER_UUID = ?;")) {
statement.setString(1, player.toString());
exceptEffectedRows(statement.executeUpdate(), 1);
}
@ -140,7 +142,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 " + tablePrefix() + "LINKED_ACCOUNTS;")) {
try (ResultSet resultSet = statement.executeQuery("select count(*) from " + tablePrefix() + LINKED_ACCOUNTS_TABLE_NAME + ";")) {
if (resultSet.next()) {
return resultSet.getInt(1);
}

2
common/src/main/java/com/discordsrv/common/storage/impl/sql/file/H2Storage.java
View File

@ -102,7 +102,7 @@ public class H2Storage extends SQLStorage {
public void createTables(Connection connection, String tablePrefix) throws SQLException {
try (Statement statement = connection.createStatement()) {
statement.execute(
"create table if not exists " + tablePrefix + "linked_accounts "
"create table if not exists " + tablePrefix + LINKED_ACCOUNTS_TABLE_NAME + " "
+ "(ID int not null auto_increment, "
+ "PLAYER_UUID varchar(36), "
+ "USER_ID bigint, "

2
common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MySQLStorage.java
View File

@ -54,7 +54,7 @@ public class MySQLStorage extends HikariStorage {
public void createTables(Connection connection, String tablePrefix) throws SQLException {
try (Statement statement = connection.createStatement()) {
statement.execute(
"create table if not exists " + tablePrefix + "linked_accounts "
"create table if not exists " + tablePrefix + LINKED_ACCOUNTS_TABLE_NAME + " "
+ "(ID int not null auto_increment, "
+ "PLAYER_UUID varchar(36), "
+ "USER_ID bigint, "