Altitude/proxydiscordlink
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed incorrect naming in database

Browse Source
This commit is contained in:
Teriuihi 2021-09-16 17:56:29 +02:00
parent 17d8c5e4e2
commit 34463ae4b8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/alttd/proxydiscordlink/database/Database.java
View File

@ -40,10 +40,12 @@ public class Database {
try { try {
String sql = "INSERT INTO linked_accounts " + String sql = "INSERT INTO linked_accounts " +
"VALUES (?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE player_name = ?" + "ON DUPLICATE KEY UPDATE " +
"ON DUPLICATE KEY UPDATE discord_username = ?" + "player_uuid = ?, " +
"ON DUPLICATE KEY UPDATE discord_id = ?" + "player_name = ?, " +
"ON DUPLICATE KEY UPDATE nickname = ?"; "discord_username = ?, " +
"discord_id = ?, " +
"nickname = ? ";
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql); PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
@ -54,10 +56,11 @@ public class Database {
statement.setLong(4, player.getUserId()); statement.setLong(4, player.getUserId());
statement.setInt(5, player.hasNick() ? 1 : 0); statement.setInt(5, player.hasNick() ? 1 : 0);
//Update //Update
statement.setString(6, player.getUsername()); statement.setString(6, player.getUuid().toString());
statement.setString(7, player.getDiscordUsername()); statement.setString(7, player.getUsername());
statement.setLong(8, player.getUserId()); statement.setString(8, player.getDiscordUsername());
statement.setInt(9, player.hasNick() ? 1 : 0); statement.setLong(9, player.getUserId());
statement.setInt(10, player.hasNick() ? 1 : 0);
statement.execute(); statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
@ -82,16 +85,17 @@ public class Database {
return false; return false;
} }
public void removeLinkedAccount(DiscordLinkPlayer player) { public void removeLinkedAccount(UUID uuid) {
try { try {
PreparedStatement statement = DatabaseConnection.getConnection() PreparedStatement statement = DatabaseConnection.getConnection()
.prepareStatement("DELETE FROM linked_accounts WHERE player_uuid = ?"); .prepareStatement("DELETE FROM linked_accounts WHERE player_uuid = ?");
statement.setString(1, player.getUuid().toString()); statement.setString(1, uuid.toString());
statement.execute(); statement.execute();
statement.close();
statement = DatabaseConnection.getConnection() statement = DatabaseConnection.getConnection()
.prepareStatement("DELETE FROM name_type WHERE discord_id = ?"); .prepareStatement("DELETE FROM account_roles WHERE uuid = ?");
statement.setLong(1, player.getUserId()); statement.setString(1, uuid.toString());
statement.execute(); statement.execute();
statement.close(); statement.close();
@ -141,10 +145,6 @@ public class Database {
* @return null or the requested DiscordLinkPlayer * @return null or the requested DiscordLinkPlayer
*/ */
public DiscordLinkPlayer getPlayer(long user_id) { public DiscordLinkPlayer getPlayer(long user_id) {
DiscordLinkPlayer discordLinkPlayer = DiscordLinkPlayer.getDiscordLinkPlayer(user_id);
if (discordLinkPlayer != null)
return discordLinkPlayer;
try { try {
PreparedStatement statement = DatabaseConnection.getConnection() PreparedStatement statement = DatabaseConnection.getConnection()
.prepareStatement("SELECT * FROM linked_accounts WHERE discord_id = ?"); .prepareStatement("SELECT * FROM linked_accounts WHERE discord_id = ?");
@ -195,14 +195,14 @@ public class Database {
private void addRoles(DiscordLinkPlayer discordLinkPlayer) { private void addRoles(DiscordLinkPlayer discordLinkPlayer) {
try { try {
PreparedStatement statement = DatabaseConnection.getConnection() PreparedStatement statement = DatabaseConnection.getConnection()
.prepareStatement("SELECT * FROM discord_link_roles WHERE uuid = ?"); .prepareStatement("SELECT * FROM account_roles WHERE uuid = ?");
statement.setString(1, discordLinkPlayer.getUuid().toString()); statement.setString(1, discordLinkPlayer.getUuid().toString());
ResultSet resultSet = statement.getResultSet(); ResultSet resultSet = statement.executeQuery();
while (resultSet.next()) while (resultSet.next())
{ {
discordLinkPlayer.getRoles().add(resultSet.getString("internal_role_name")); discordLinkPlayer.getRoles().add(resultSet.getString("role_name"));
} }
} catch (SQLException exception) { } catch (SQLException exception) {
exception.printStackTrace(); exception.printStackTrace();