Converted to long for discord_id for database and removed unneeded data
This commit is contained in:
parent
899ddb8703
commit
242605c6fb
|
|
@ -14,55 +14,50 @@ public class Database {
|
||||||
|
|
||||||
public void createTables() {
|
public void createTables() {
|
||||||
String linked_accounts = "CREATE TABLE IF NOT EXISTS linked_accounts (" +
|
String linked_accounts = "CREATE TABLE IF NOT EXISTS linked_accounts (" +
|
||||||
"player_uuid VARCHAR(36) NOT NULL, " +
|
"`player_uuid` VARCHAR(36) NOT NULL, " +
|
||||||
"player_name VARCHAR(16) NOT NULL, " +
|
"`player_name` VARCHAR(16) NOT NULL, " +
|
||||||
"discord_username VARCHAR(256) NOT NULL, " +
|
"`discord_username` VARCHAR(256) NOT NULL, " +
|
||||||
"discord_id VARCHAR(256) NOT NULL, " +
|
"`discord_id` BIGINT NOT NULL, " +
|
||||||
"nickname BIT DEFAULT b0" +
|
"`nickname` BIT DEFAULT b'0', " +
|
||||||
|
"UNIQUE(discord_id), " +
|
||||||
"PRIMARY KEY(player_uuid)" +
|
"PRIMARY KEY(player_uuid)" +
|
||||||
");";
|
");";
|
||||||
String sync_roles = "CREATE TABLE IF NOT EXISTS account_roles (" +
|
String sync_roles = "CREATE TABLE IF NOT EXISTS account_roles (" +
|
||||||
"uuid VARCHAR(36) NOT NULL, " +
|
"`uuid` VARCHAR(36) NOT NULL, " +
|
||||||
"role_name VARCHAR(32) NOT NULL, " +
|
"`role_name` VARCHAR(32) NOT NULL, " +
|
||||||
"PRIMARY KEY(uuid, role_name)" +
|
"PRIMARY KEY(uuid, role_name)" +
|
||||||
");";
|
");";
|
||||||
String updates = "CREATE TABLE IF NOT EXISTS `updates` (" +
|
|
||||||
"`player_uuid` varchar(36) NOT NULL, " +
|
|
||||||
"`player_name` varchar(16) NOT NULL, " +
|
|
||||||
"`player_nickname` varchar(16) DEFAULT NULL, " +
|
|
||||||
"`player_rank` varchar(256) DEFAULT NULL, " +
|
|
||||||
"`discord_username` varchar(256) DEFAULT NULL, " +
|
|
||||||
"`discord_id` varchar(256) DEFAULT NULL, " +
|
|
||||||
"PRIMARY KEY (`player_uuid`)" +
|
|
||||||
")";
|
|
||||||
try {
|
try {
|
||||||
Statement statement = DatabaseConnection.getConnection().createStatement();
|
Statement statement = DatabaseConnection.getConnection().createStatement();
|
||||||
statement.execute(linked_accounts);
|
statement.execute(linked_accounts);
|
||||||
statement.execute(sync_roles);
|
statement.execute(sync_roles);
|
||||||
statement.execute(updates);
|
} catch (SQLException exception) {
|
||||||
} catch (SQLException var3) {
|
exception.printStackTrace();
|
||||||
var3.printStackTrace();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void syncPlayer(DiscordLinkPlayer player) { //TODO make discord_id unique
|
public void syncPlayer(DiscordLinkPlayer player) {
|
||||||
try {
|
try {
|
||||||
String playerNickname = getNick(player.getUuid());
|
|
||||||
String sql = "INSERT INTO linked_accounts " +
|
String sql = "INSERT INTO linked_accounts " +
|
||||||
"VALUES (?, ?, ?, ?) " +
|
"VALUES (?, ?, ?, ?, ?) " +
|
||||||
"ON DUPLICATE KEY UPDATE player_name = ?" +
|
"ON DUPLICATE KEY UPDATE player_name = ?" +
|
||||||
"ON DUPLICATE KEY UPDATE discord_username = ?";
|
"ON DUPLICATE KEY UPDATE discord_username = ?" +
|
||||||
|
"ON DUPLICATE KEY UPDATE discord_id = ?" +
|
||||||
|
"ON DUPLICATE KEY UPDATE nickname = ?";
|
||||||
|
|
||||||
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
|
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
|
||||||
|
|
||||||
|
//Insert
|
||||||
statement.setString(1, player.getUuid().toString());
|
statement.setString(1, player.getUuid().toString());
|
||||||
statement.setString(2, player.getUsername());
|
statement.setString(2, player.getUsername());
|
||||||
statement.setString(3, playerNickname);
|
statement.setString(3, player.getDiscordUsername());
|
||||||
statement.setString(4, player.getDiscordUsername());
|
statement.setLong(4, player.getUserId());
|
||||||
statement.setLong(5, player.getUserId());
|
statement.setInt(5, player.hasNick() ? 1 : 0);
|
||||||
|
//Update
|
||||||
statement.setString(6, player.getUsername());
|
statement.setString(6, player.getUsername());
|
||||||
statement.setString(7, playerNickname);
|
statement.setString(7, player.getDiscordUsername());
|
||||||
statement.setString(8, player.getDiscordUsername());
|
statement.setLong(8, player.getUserId());
|
||||||
|
statement.setInt(9, player.hasNick() ? 1 : 0);
|
||||||
|
|
||||||
statement.execute();
|
statement.execute();
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user