Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-19 15:48:10 +01:00
Code Issues Projects Releases Wiki Activity

Changed the region MySQL database to marshal and unmarshal values using YAML, which should fix the notable problems regarding non-string flag data types.

Browse Source
This commit is contained in:
sk89q 2012-10-19 15:14:00 -07:00
parent 3957aa83fc
commit 94937e41ef
1 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java
View File

@ -20,6 +20,12 @@
package com.sk89q.worldguard.protection.databases; package com.sk89q.worldguard.protection.databases;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -27,12 +33,12 @@
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.sql.Connection; import org.yaml.snakeyaml.DumperOptions;
import java.sql.DriverManager; import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import java.sql.ResultSet; import org.yaml.snakeyaml.Yaml;
import java.sql.SQLException; import org.yaml.snakeyaml.constructor.SafeConstructor;
import java.sql.Statement; import org.yaml.snakeyaml.error.YAMLException;
import java.sql.PreparedStatement; import org.yaml.snakeyaml.representer.Representer;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.BlockVector2D; import com.sk89q.worldedit.BlockVector2D;
@ -50,6 +56,8 @@
public class MySQLDatabase extends AbstractProtectionDatabase { public class MySQLDatabase extends AbstractProtectionDatabase {
private final Logger logger; private final Logger logger;
private Yaml yaml;
private Map<String, ProtectedRegion> regions; private Map<String, ProtectedRegion> regions;
private Map<String, ProtectedRegion> cuboidRegions; private Map<String, ProtectedRegion> cuboidRegions;
@ -122,6 +130,15 @@ public MySQLDatabase(ConfigurationManager config, String world, Logger logger) t
// no point continuing // no point continuing
return; return;
} }
DumperOptions options = new DumperOptions();
options.setIndent(2);
options.setDefaultFlowStyle(FlowStyle.FLOW);
Representer representer = new Representer();
representer.setDefaultFlowStyle(FlowStyle.FLOW);
// We have to use this in order to properly save non-string values
yaml = new Yaml(new SafeConstructor(), new Representer(), options);
} }
private void connect() throws SQLException { private void connect() throws SQLException {
@ -163,8 +180,8 @@ private void loadFlags(ProtectedRegion region) {
while (flagsResultSet.next()) { while (flagsResultSet.next()) {
regionFlags.put( regionFlags.put(
flagsResultSet.getString("flag"), flagsResultSet.getString("flag"),
flagsResultSet.getObject("value") sqlUnmarshal(flagsResultSet.getString("value"))
); );
} }
// @TODO: Make this better // @TODO: Make this better
@ -453,6 +470,7 @@ private void loadPoly2d() {
poly2dRegions = regions; poly2dRegions = regions;
} }
@Override
public void load() throws ProtectionDatabaseException { public void load() throws ProtectionDatabaseException {
try { try {
connect(); connect();
@ -631,6 +649,7 @@ private Map<String,Integer> getGroupIds(String... groupnames) {
* *
* @see com.sk89q.worldguard.protection.databases.ProtectionDatabase#save() * @see com.sk89q.worldguard.protection.databases.ProtectionDatabase#save()
*/ */
@Override
public void save() throws ProtectionDatabaseException { public void save() throws ProtectionDatabaseException {
try { try {
connect(); connect();
@ -739,7 +758,7 @@ private void updateFlags(ProtectedRegion region) throws SQLException {
for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) { for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
if (entry.getValue() == null) continue; if (entry.getValue() == null) continue;
Object flag = marshalFlag(entry.getKey(), entry.getValue()); Object flag = sqlMarshal(marshalFlag(entry.getKey(), entry.getValue()));
PreparedStatement insertFlagStatement = this.conn.prepareStatement( PreparedStatement insertFlagStatement = this.conn.prepareStatement(
"INSERT INTO `region_flag` ( " + "INSERT INTO `region_flag` ( " +
@ -1007,11 +1026,25 @@ private void updateRegionGlobal(GlobalProtectedRegion region) throws SQLExceptio
updateRegion(region, "global"); updateRegion(region, "global");
} }
@Override
public Map<String, ProtectedRegion> getRegions() { public Map<String, ProtectedRegion> getRegions() {
return regions; return regions;
} }
@Override
public void setRegions(Map<String, ProtectedRegion> regions) { public void setRegions(Map<String, ProtectedRegion> regions) {
this.regions = regions; this.regions = regions;
} }
protected Object sqlUnmarshal(String rawValue) {
try {
return yaml.load(rawValue);
} catch (YAMLException e) {
return String.valueOf(rawValue);
}
}
protected String sqlMarshal(Object rawObject) {
return yaml.dump(rawObject);
}
} }