ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

fix(sql): mockbukkit is the issue

Browse source
This commit is contained in:
ineanto 2023-07-15 10:29:59 +02:00
parent 3a7da4b3d6
commit 7d07834bf7
3 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorage.java
View file

@ -7,9 +7,10 @@ import xyz.atnrch.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.Storage;
import java.io.ByteArrayInputStream;
import java.nio.ByteBuffer;
import java.sql.*;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Optional;
import java.util.UUID;
import java.util.logging.Logger;
@ -54,7 +55,7 @@ public class SQLStorage extends Storage {
if (connection == null) return false;
try {
final String sql = "SELECT * FROM nicko.DATA WHERE uuid = ?";
final String sql = "SELECT uuid FROM nicko.DATA WHERE uuid = ?";
final PreparedStatement statement = connection.prepareStatement(sql);
statement.setString(1, uuid.toString());
@ -71,6 +72,7 @@ public class SQLStorage extends Storage {
public Optional<NickoProfile> retrieve(UUID uuid) {
final Connection connection = getProvider().getConnection();
if (connection == null) return Optional.empty();
if (!isStored(uuid)) return Optional.empty();
try {
final String sql = "SELECT * FROM nicko.DATA WHERE uuid = ?";
@ -89,6 +91,9 @@ public class SQLStorage extends Storage {
locale = resultSet.getString("locale");
bungeecord = resultSet.getBoolean("bungeecord");
}
System.out.println("name = " + name);
System.out.println("skin = " + skin);
System.out.println("locale = " + locale);
final NickoProfile profile = new NickoProfile(name, skin, Locale.fromCode(locale), bungeecord);
return Optional.of(profile);
@ -104,7 +109,7 @@ public class SQLStorage extends Storage {
if (connection == null) return ActionResult.error(I18NDict.Error.SQL_ERROR);
try {
final String sql = "DELETE FROM nicko.DATA WHERE uuid = ? LIMIT 1";
final String sql = "DELETE FROM nicko.DATA WHERE uuid = ?";
final PreparedStatement statement = connection.prepareStatement(sql);
statement.setString(1, uuid.toString());
int rows = statement.executeUpdate();
@ -136,12 +141,4 @@ public class SQLStorage extends Storage {
statement.setString(5, uuid.toString());
return statement;
}
private ByteArrayInputStream uuidToBin(UUID uuid) {
byte[] bytes = new byte[16];
ByteBuffer.wrap(bytes)
.putLong(uuid.getMostSignificantBits())
.putLong(uuid.getLeastSignificantBits());
return new ByteArrayInputStream(bytes);
}
}

2
src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorageProvider.java
View file

@ -65,7 +65,7 @@ public class SQLStorageProvider implements StorageProvider {
"skin varchar(16)," +
"locale char(2) NOT NULL," +
"bungeecord boolean NOT NULL," +
"PRIMARY KEY (UUID))";
"PRIMARY KEY (uuid))";
query = query.replace("%s", schemaName);
final PreparedStatement statement = connection.prepareStatement(query);