From 143bcf6d762dca955e614c9d38f84a8d0177b62b Mon Sep 17 00:00:00 2001
From: Philip Cass <frymaster@127001.org>
Date: Sat, 28 Feb 2015 12:12:27 +0000
Subject: [PATCH] Add missing index on playername column

---
 src/main/java/de/diddiz/LogBlock/Updater.java | 66 ++++++++++---------
 src/main/resources/plugin.yml                 |  2 +-
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java
index 5fadc84..ea4aa18 100644
--- a/src/main/java/de/diddiz/LogBlock/Updater.java
+++ b/src/main/java/de/diddiz/LogBlock/Updater.java
@@ -306,38 +306,6 @@ class Updater
 				return false;
 			}
 			config.set("version", "1.90");
-		}
-			if (config.getString("version").compareTo("1.91") < 0) {
-			getLogger().info("Updating tables to 1.91 ...");
-			final Connection conn = logblock.getConnection();
-				try {
-				conn.setAutoCommit(true);
-				final Statement st = conn.createStatement();
-				// Need to wrap both these next two inside individual try/catch statements in case index does not exist
-				try {
-					st.execute("DROP INDEX UUID ON `lb-players`");
-				} catch (final SQLException ex) {
-					if (ex.getErrorCode() != 1091) {
-						Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
-						return false;
-					}
-				}
-				try {
-					st.execute("DROP INDEX playername ON `lb-players`");
-				} catch (final SQLException ex) {
-					if (ex.getErrorCode() != 1091) {
-						Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
-						return false;
-					}
-				}
-				st.execute("CREATE INDEX UUID ON `lb-players` (UUID);");
-				st.close();
-				conn.close();
-				} catch (final SQLException ex) {
-					Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
-					return false;
-				}
-			config.set("version", "1.91");
 		}
 		// Ensure charset for free-text fields is UTF-8, or UTF8-mb4 if possible
 		// As this may be an expensive operation and the database default may already be this, check on a table-by-table basis before converting
@@ -377,6 +345,40 @@ class Updater
 			}
 			config.set("version", "1.92");
 		}
+		if (config.getString("version").compareTo("1.93") < 0) {
+			getLogger().info("Updating tables to 1.93 ...");
+			final Connection conn = logblock.getConnection();
+				try {
+				conn.setAutoCommit(true);
+				final Statement st = conn.createStatement();
+				// Need to wrap both these next two inside individual try/catch statements in case index does not exist
+				try {
+					st.execute("DROP INDEX UUID ON `lb-players`");
+				} catch (final SQLException ex) {
+					if (ex.getErrorCode() != 1091) {
+						Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
+						return false;
+					}
+				}
+				try {
+					st.execute("DROP INDEX playername ON `lb-players`");
+				} catch (final SQLException ex) {
+					if (ex.getErrorCode() != 1091) {
+						Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
+						return false;
+					}
+				}
+				st.execute("CREATE INDEX UUID ON `lb-players` (UUID);");
+				st.execute("CREATE INDEX playername ON `lb-players` (playername);");
+				st.close();
+				conn.close();
+				} catch (final SQLException ex) {
+					Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
+					return false;
+				}
+			config.set("version", "1.93");
+		}
+
 		logblock.saveConfig();
 		return true;
 	}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index e143a31..cb3d5ca 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: ${project.name}
-version: '1.92'
+version: '1.93'
 author: DiddiZ
 authors: [md_5, ammar2, frymaster]
 website: http://dev.bukkit.org/server-mods/logblock/