Fix migration

Lauriichan · Feb 4, 2022 · febd9ed · febd9ed
1 parent f74b022
commit febd9ed
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.lauriichan.minecraft.wildcard</groupId>
     <artifactId>wildcard-parent</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/wildcard-core/pom.xml b/wildcard-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>me.lauriichan.minecraft.wildcard</groupId>
         <artifactId>wildcard-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>wildcard-core</artifactId>
 

diff --git a/...n/minecraft/wildcard/core/data/storage/mysql/migration/TokenMigration2022_02_04_0_40.java b/...n/minecraft/wildcard/core/data/storage/mysql/migration/TokenMigration2022_02_04_0_40.java
@@ -42,7 +42,8 @@ public PreparedStatement startBatch(Connection connection, String table) throws
     public void migrateBatch(PreparedStatement statement, ResultSet legacyData) throws SQLException {
         statement.setString(1, UUIDHelper.toUniqueId(legacyData.getBytes("Owner")).toString());
         statement.setString(2, Hex.encodeHexString(legacyData.getBytes("Token")));
-        statement.setObject(3, legacyData.getObject("Expires", OffsetDateTime.class));
+        statement.setInt(3, legacyData.getInt("Uses"));
+        statement.setObject(4, legacyData.getObject("Expires", OffsetDateTime.class));
         statement.addBatch();
     }
 

diff --git a/.../minecraft/wildcard/core/data/storage/sqlite/migration/TokenMigration2022_02_04_0_40.java b/.../minecraft/wildcard/core/data/storage/sqlite/migration/TokenMigration2022_02_04_0_40.java
@@ -41,7 +41,8 @@ public PreparedStatement startBatch(Connection connection, String table) throws
     public void migrateBatch(PreparedStatement statement, ResultSet legacyData) throws SQLException {
         statement.setString(1, UUIDHelper.toUniqueId(legacyData.getBytes("Owner")).toString());
         statement.setString(2, Hex.encodeHexString(legacyData.getBytes("Token")));
-        statement.setString(3, legacyData.getString("Expires"));
+        statement.setInt(3, legacyData.getInt("Uses"));
+        statement.setString(4, legacyData.getString("Expires"));
         statement.addBatch();
     }
 

diff --git a/wildcard-fabric/gradle.properties b/wildcard-fabric/gradle.properties
@@ -9,6 +9,6 @@ loader_version=0.12.12
 
 # Mod Properties
 mod_patch = 0
-mod_version = 2.1.0
+mod_version = 2.1.1
 maven_group = me.lauriichan.minecraft.wildcard
 archives_base_name = wildcard-fabric
diff --git a/wildcard-forge/gradle.properties b/wildcard-forge/gradle.properties
@@ -4,6 +4,6 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_patch = 0
-mod_version = 2.1.0
+mod_version = 2.1.1
 maven_group = me.lauriichan.minecraft.wildcard
 archives_base_name = wildcard-forge
diff --git a/wildcard-migration/pom.xml b/wildcard-migration/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>me.lauriichan.minecraft.wildcard</groupId>
         <artifactId>wildcard-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>wildcard-migration</artifactId>
     <description>Migration lib for the wildcard core</description>

diff --git a/wildcard-sponge/pom.xml b/wildcard-sponge/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>me.lauriichan.minecraft.wildcard</groupId>
         <artifactId>wildcard-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>wildcard-sponge</artifactId>
 

diff --git a/wildcard-vanilla/pom.xml b/wildcard-vanilla/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>me.lauriichan.minecraft.wildcard</groupId>
         <artifactId>wildcard-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>wildcard-vanilla</artifactId>