diff --git a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala index f494a4a..8dda5c3 100644 --- a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala +++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala @@ -35,6 +35,7 @@ Database() withTransaction { session => val conn = session.conn + val manager = new JDBCVersionManager(conn) // Check version val versionFile = new File(GitBucketHome, "version") @@ -56,9 +57,8 @@ } // Change form - val manager = new JDBCVersionManager(conn) manager.initialize() - manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0") + manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0") conn.select("SELECT PLUGIN_ID, VERSION FROM PLUGIN"){ rs => manager.updateVersion(rs.getString("PLUGIN_ID"), rs.getString("VERSION")) } @@ -72,6 +72,13 @@ } } + // Rescue code for users who updated from 3.14 to 4.0.0 + // https://github.com/gitbucket/gitbucket/issues/1227 + val currentVersion = manager.getCurrentVersion(GitBucketCoreModule.getModuleId) + if(currentVersion == "4.0"){ + manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0") + } + // Run normal migration logger.info("Start schema update") val solidbase = new Solidbase()