feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Use columnName instead of columnIndex

Browse Source 
It's safer to rely on names instead of indexes.
It's also easier to add new columns at the end of the table.
This commit is contained in:
Smart123s
2022-07-18 11:42:17 +02:00
committed by Smart123s
parent 62ca46fe6a
commit b0b998d1aa
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/com/github/games647/fastlogin/core/storage/SQLStorage.java
View File

@ -50,19 +50,23 @@ public abstract class SQLStorage implements AuthStorage {
+ "`UUID` CHAR(36), " + "`UUID` CHAR(36), "
+ "`Name` VARCHAR(16) NOT NULL, " + "`Name` VARCHAR(16) NOT NULL, "
+ "`Premium` BOOLEAN NOT NULL, " + "`Premium` BOOLEAN NOT NULL, "
+ "`Floodgate` BOOLEAN NOT NULL, "
+ "`LastIp` VARCHAR(255) NOT NULL, " + "`LastIp` VARCHAR(255) NOT NULL, "
+ "`LastLogin` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, " + "`LastLogin` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
//the premium shouldn't steal the cracked account by changing the name //the premium shouldn't steal the cracked account by changing the name
+ "UNIQUE (`Name`) " + "UNIQUE (`Name`) "
+ ')'; + ')';
protected static final String LOAD_BY_NAME = "SELECT * FROM `" + PREMIUM_TABLE + "` WHERE `Name`=? LIMIT 1"; protected static final String LOAD_BY_NAME = "SELECT * FROM `" + PREMIUM_TABLE
protected static final String LOAD_BY_UUID = "SELECT * FROM `" + PREMIUM_TABLE + "` WHERE `UUID`=? LIMIT 1"; + "` WHERE `Name`=? LIMIT 1";
protected static final String LOAD_BY_UUID = "SELECT * FROM `" + PREMIUM_TABLE
+ "` WHERE `UUID`=? LIMIT 1";
protected static final String INSERT_PROFILE = "INSERT INTO `" + PREMIUM_TABLE protected static final String INSERT_PROFILE = "INSERT INTO `" + PREMIUM_TABLE
+ "` (`UUID`, `Name`, `Premium`, `LastIp`) " + "VALUES (?, ?, ?, ?) "; + "` (`UUID`, `Name`, `Premium`, `Floodgate`, `LastIp`) " + "VALUES (?, ?, ?, ?, ?) ";
// limit not necessary here, because it's unique // limit not necessary here, because it's unique
protected static final String UPDATE_PROFILE = "UPDATE `" + PREMIUM_TABLE protected static final String UPDATE_PROFILE = "UPDATE `" + PREMIUM_TABLE
+ "` SET `UUID`=?, `Name`=?, `Premium`=?, `LastIp`=?, `LastLogin`=CURRENT_TIMESTAMP WHERE `UserID`=?"; + "` SET `UUID`=?, `Name`=?, `Premium`=?, `Floodgate`=?, `LastIp`=?, "
+ "`LastLogin`=CURRENT_TIMESTAMP WHERE `UserID`=?";
protected final Logger log; protected final Logger log;
protected final HikariDataSource dataSource; protected final HikariDataSource dataSource;
@ -97,7 +101,7 @@ public abstract class SQLStorage implements AuthStorage {
loadStmt.setString(1, name); loadStmt.setString(1, name);
try (ResultSet resultSet = loadStmt.executeQuery()) { try (ResultSet resultSet = loadStmt.executeQuery()) {
return parseResult(resultSet).orElseGet(() -> new StoredProfile(null, name, false, "")); return parseResult(resultSet).orElseGet(() -> new StoredProfile(null, name, false, false, ""));
} }
} catch (SQLException sqlEx) { } catch (SQLException sqlEx) {
log.error("Failed to query profile: {}", name, sqlEx); log.error("Failed to query profile: {}", name, sqlEx);
@ -124,14 +128,14 @@ public abstract class SQLStorage implements AuthStorage {
private Optional<StoredProfile> parseResult(ResultSet resultSet) throws SQLException { private Optional<StoredProfile> parseResult(ResultSet resultSet) throws SQLException {
if (resultSet.next()) { if (resultSet.next()) {
long userId = resultSet.getInt(1); long userId = resultSet.getInt("UserID");
UUID uuid = Optional.ofNullable(resultSet.getString(2)).map(UUIDAdapter::parseId).orElse(null); UUID uuid = Optional.ofNullable(resultSet.getString("UUID")).map(UUIDAdapter::parseId).orElse(null);
String name = resultSet.getString(3); String name = resultSet.getString("Name");
boolean premium = resultSet.getBoolean(4); boolean premium = resultSet.getBoolean("Premium");
String lastIp = resultSet.getString(5); String lastIp = resultSet.getString("LastIp");
Instant lastLogin = resultSet.getTimestamp(6).toInstant(); Instant lastLogin = resultSet.getTimestamp("LastLogin").toInstant();
return Optional.of(new StoredProfile(userId, uuid, name, premium, lastIp, lastLogin)); return Optional.of(new StoredProfile(userId, uuid, name, premium, lastIp, lastLogin));
} }