Upstream/SaneEconomy
1
0
Fork 0
mirror of https://github.com/AppleDash/SaneEconomy.git synced 2024-06-21 20:14:46 +02:00
Code Issues Projects Releases Wiki Activity

Implement support for storing an Economable's last name in the database.

Browse Source
This commit is contained in:
AppleDash 2018-10-05 04:17:58 -04:00
parent 71832bfffa
commit 3c84fe510e
7 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java
View File

@ -46,11 +46,16 @@ public class EconomyStorageBackendMySQL extends EconomyStorageBackendCaching {
if (schemaVersion == -1) {
conn.prepareStatement(String.format("CREATE TABLE IF NOT EXISTS `%s` (`key` VARCHAR(32) PRIMARY KEY, `val` TEXT)", dbConn.getTable("saneeconomy_schema"))).executeUpdate();
conn.prepareStatement(String.format("REPLACE INTO %s (`key`, `val`) VALUES ('schema_version', 2)", dbConn.getTable("saneeconomy_schema"))).executeUpdate();
conn.prepareStatement(String.format("CREATE TABLE `%s` (unique_identifier VARCHAR(128) PRIMARY KEY, balance DECIMAL(18, 2))", dbConn.getTable("saneeconomy_balances"))).executeUpdate();
schemaVersion = 2;
conn.prepareStatement(String.format("CREATE TABLE `%s` (unique_identifier VARCHAR(128) PRIMARY KEY, last_name VARCHAR(16), balance DECIMAL(18, 2))", dbConn.getTable("saneeconomy_balances"))).executeUpdate();
schemaVersion = 3;
}
if (schemaVersion != 2) {
if (schemaVersion == 2) {
conn.prepareStatement("ALTER TABLE `%s` ADD `last_name` VARCHAR(16)").executeUpdate();
schemaVersion = 3;
}
if (schemaVersion != 3) {
throw new RuntimeException("Invalid database schema version!");
}
} catch (SQLException e) {
@ -99,9 +104,10 @@ public class EconomyStorageBackendMySQL extends EconomyStorageBackendCaching {
try {
ensureAccountExists(economable, conn);
conn.prepareStatement("LOCK TABLE " + dbConn.getTable("saneeconomy_balances") + " WRITE").execute();
PreparedStatement statement = dbConn.prepareStatement(conn, String.format("UPDATE `%s` SET balance = ? WHERE `unique_identifier` = ?", dbConn.getTable("saneeconomy_balances")));
PreparedStatement statement = dbConn.prepareStatement(conn, String.format("UPDATE `%s` SET balance = ?, last_name = ? WHERE `unique_identifier` = ?", dbConn.getTable("saneeconomy_balances")));
statement.setDouble(1, newBalance);
statement.setString(2, economable.getUniqueIdentifier());
statement.setString(2, economable.getName());
statement.setString(3, economable.getUniqueIdentifier());
statement.executeUpdate();
conn.prepareStatement("UNLOCK TABLES").execute();
} catch (Exception e) {
@ -113,8 +119,9 @@ public class EconomyStorageBackendMySQL extends EconomyStorageBackendCaching {
private void ensureAccountExists(Economable economable, Connection conn) throws SQLException {
if (!accountExists(economable, conn)) {
PreparedStatement statement = dbConn.prepareStatement(conn, String.format("INSERT INTO `%s` (unique_identifier, balance) VALUES (?, 0.0)", dbConn.getTable("saneeconomy_balances")));
PreparedStatement statement = dbConn.prepareStatement(conn, String.format("INSERT INTO `%s` (unique_identifier, last_name, balance) VALUES (?, ?, 0.0)", dbConn.getTable("saneeconomy_balances")));
statement.setString(1, economable.getUniqueIdentifier());
statement.setString(2, economable.getName());
statement.executeUpdate();
}
}

1
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/Economable.java
View File

@ -13,6 +13,7 @@ public interface Economable {
Economable PLUGIN = new EconomablePlugin();
String getUniqueIdentifier();
String getName();
default OfflinePlayer tryCastToPlayer() {
return null;
}

5
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomableConsole.java
View File

@ -5,6 +5,11 @@ package org.appledash.saneeconomy.economy.economable;
* Blackjack is best pony.
*/
public class EconomableConsole implements Economable {
@Override
public String getName() {
return "CONSOLE";
}
@Override
public String getUniqueIdentifier() {
return "CONSOLE";

6
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomableFaction.java
View File

@ -15,4 +15,10 @@ public class EconomableFaction implements Economable {
public String getUniqueIdentifier() {
return "faction:" + factionUuid;
}
@Override
public String getName() {
// FIXME
return this.factionUuid;
}
}

5
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomableGeneric.java
View File

@ -15,4 +15,9 @@ public class EconomableGeneric implements Economable {
public String getUniqueIdentifier() {
return uniqueIdentifier;
}
@Override
public String getName() {
return uniqueIdentifier.substring(16);
}
}

5
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomablePlayer.java
View File

@ -13,6 +13,11 @@ public class EconomablePlayer implements Economable {
this.handle = handle;
}
@Override
public String getName() {
return handle.getName();
}
@Override
public String getUniqueIdentifier() {
return "player:" + handle.getUniqueId();

6
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomablePlugin.java
View File

@ -9,4 +9,10 @@ public class EconomablePlugin implements Economable {
public String getUniqueIdentifier() {
return "PLUGIN";
}
@Override
public String getName() {
// FIXME
return "PLUGIN";
}
}