Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix SQL syntax issue.

Browse Source
This commit is contained in:
gmcferrin 2013-01-12 00:34:52 -05:00
parent 2ed5e8e717
commit 0871a96399
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/datatypes/DatabaseUpdate.java
View File

@ -2,5 +2,6 @@ package com.gmail.nossr50.datatypes;
public enum DatabaseUpdate { public enum DatabaseUpdate {
FISHING, FISHING,
BLAST_MINING; BLAST_MINING,
CASCADE_DELETE;
} }

11
src/main/java/com/gmail/nossr50/util/Database.java
View File

@ -87,7 +87,7 @@ public class Database {
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
+ "`hudtype` varchar(50) NOT NULL DEFAULT 'STANDARD'," + "`hudtype` varchar(50) NOT NULL DEFAULT 'STANDARD',"
+ "PRIMARY KEY (`user_id`)" + "PRIMARY KEY (`user_id`)"
+ "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`)" + "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`"
+ "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); + "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "cooldowns` (" write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "cooldowns` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
@ -104,7 +104,7 @@ public class Database {
+ "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0'," + "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
+ "`blast_mining` int(32) unsigned NOT NULL DEFAULT '0'," + "`blast_mining` int(32) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)" + "PRIMARY KEY (`user_id`)"
+ "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`)" + "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`"
+ "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); + "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "skills` (" write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "skills` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
@ -120,7 +120,7 @@ public class Database {
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0'," + "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0'," + "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)" + "PRIMARY KEY (`user_id`)"
+ "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`)" + "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`"
+ "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); + "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "experience` (" write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "experience` ("
+ "`user_id` int(10) unsigned NOT NULL," + "`user_id` int(10) unsigned NOT NULL,"
@ -136,11 +136,12 @@ public class Database {
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0'," + "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0'," + "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
+ "PRIMARY KEY (`user_id`)" + "PRIMARY KEY (`user_id`)"
+ "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`)" + "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users`"
+ "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); + "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
checkDatabaseStructure(DatabaseUpdate.FISHING); checkDatabaseStructure(DatabaseUpdate.FISHING);
checkDatabaseStructure(DatabaseUpdate.BLAST_MINING); checkDatabaseStructure(DatabaseUpdate.BLAST_MINING);
checkDatabaseStructure(DatabaseUpdate.CASCADE_DELETE);
} }
/** /**
@ -200,7 +201,7 @@ public class Database {
} }
} finally { } finally {
if (resultSet != null) { if (resultSet != null) {
try { try {
resultSet.close(); resultSet.close();
} catch (SQLException e) { } catch (SQLException e) {
// Ignore the error, we're leaving // Ignore the error, we're leaving