Merge pull request Civcraft#20 from TealNerd/master

Fixed db issues on startup
Maxopoly · Oct 31, 2016 · d83bd91 · d83bd91
2 parents 1a97d9d + 95427ca
commit d83bd91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Bastion/src/isaac/bastion/Bastion.java b/Bastion/src/isaac/bastion/Bastion.java
@@ -78,6 +78,11 @@ private void setupDatabase() {
 		}
 		storage = new BastionBlockStorage(db, getLogger());
 		storage.registerMigrations();
+		if(!db.updateDatabase()) {
+			warning("Failed to update database, stopping bastion");
+			getServer().getPluginManager().disablePlugin(this);
+			return;
+		}
 		storage.loadBastions();
 	}
 

diff --git a/Bastion/src/isaac/bastion/storage/BastionBlockStorage.java b/Bastion/src/isaac/bastion/storage/BastionBlockStorage.java
@@ -67,16 +67,16 @@ public void registerMigrations() {
 		db.registerMigration(0, false, 
 				"create table if not exists `bastion_blocks`("
 				+ "bastion_id int(10) unsigned NOT NULL AUTO_INCREMENT,"
-				+ "bastion_type varchar(40) NOT NULL DEFAULT " + BastionType.getDefaultType()
+				+ "bastion_type varchar(40) NOT NULL DEFAULT '" + BastionType.getDefaultType() + "',"
 				+ "loc_x int(10),"
 				+ "loc_y int(10),"
 				+ "loc_z int(10),"
 				+ "loc_world varchar(40) NOT NULL,"
 				+ "placed bigint(20) Unsigned,"
 				+ "fraction float(20) Unsigned,"
-				+ "PRIMARY_KEY (`bastion_id`));");
+				+ "PRIMARY KEY (`bastion_id`));");
 		db.registerMigration(1, false, 
-				"ALTER TABLE bastion_blocks ADD COLUMN IF NOT EXISTS bastion_type VARCHAR(40) DEAULT '"
+				"ALTER TABLE bastion_blocks ADD COLUMN IF NOT EXISTS bastion_type VARCHAR(40) DEFAULT '"
 				+ BastionType.getDefaultType() + "';");	
 		db.registerMigration(2, false, 
 				"ALTER TABLE bastion_blocks ADD COLUMN dead TINYINT(1) DEFAULT 0;");