The Unified and Autonomous Development Platform
fix: Preserve MySQL blob capacity during upgrades
Robin Shen64605ca8265a
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 0c88229d34..d7638e4f6b 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -9525,4 +9525,8 @@ public class DataMigrator {}}+ private void migrate247(File dataDir, Stack<Integer> versions) {+ // Recreate the schema to restore longblob columns on MySQL/MariaDB (OD-3157).+ }+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/MySQLBlobTypeContributor.java b/server-core/src/main/java/io/onedev/server/persistence/MySQLBlobTypeContributor.javanew file mode 100644index 0000000000..ccb01bffc5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/MySQLBlobTypeContributor.java@@ -0,0 +1,26 @@+package io.onedev.server.persistence;++import java.sql.Types;++import org.hibernate.boot.model.TypeContributions;+import org.hibernate.boot.model.TypeContributor;+import org.hibernate.dialect.MySQLDialect;+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;+import org.hibernate.service.ServiceRegistry;+import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;++public class MySQLBlobTypeContributor implements TypeContributor {++ @Override+ public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {+ var dialect = serviceRegistry.requireService(JdbcEnvironment.class).getDialect();+ // MariaDBDialect also extends MySQLDialect. Hibernate 5 always used longblob+ // for binary LOBs here; honoring @Column.length would shrink existing columns+ // when an upgrade recreates the schema, preventing large values from restoring.+ if (dialect instanceof MySQLDialect) {+ typeContributions.getTypeConfiguration().getDdlTypeRegistry()+ .addDescriptor(new DdlTypeImpl(Types.BLOB, "longblob", "binary", dialect));+ }+ }++}diff --git a/server-core/src/main/resources/META-INF/services/org.hibernate.boot.model.TypeContributor b/server-core/src/main/resources/META-INF/services/org.hibernate.boot.model.TypeContributornew file mode 100644index 0000000000..deee453dd7--- /dev/null+++ b/server-core/src/main/resources/META-INF/services/org.hibernate.boot.model.TypeContributor@@ -0,0 +1 @@+io.onedev.server.persistence.MySQLBlobTypeContributordiff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.javaindex 083f5a63e6..e80970c06c 100644--- a/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.java+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.java@@ -75,6 +75,23 @@ public class HibernateSchemaTest {assertTrue(sql.stream().anyMatch(command -> command.contains(" not null")), dialect);assertTrue(sql.stream().anyMatch(command -> command.contains(" unique ")), dialect);assertTrue(sql.stream().anyMatch(command -> command.startsWith("create index ")), dialect);+ if (dialect.contains("MySQL") || dialect.contains("MariaDB")) {+ // Hibernate 5 used longblob for every binary LOB, regardless of+ // @Column.length. Shrinking these columns breaks backup imports.+ int blobCount = 0;+ for (var table : metadata.collectTableMappings()) {+ for (var column : table.getColumns()) {+ if (column.getSqlTypeCode(metadata) == java.sql.Types.BLOB) {+ assertEquals("longblob", column.getSqlType(metadata),+ dialect + ": " + table.getName() + "." + column.getName());+ blobCount++;+ }+ }+ }+ assertTrue(blobCount > 0, dialect);+ assertTrue(sql.stream().anyMatch(command -> command.startsWith("create table o_Setting ")+ && command.contains("o_value longblob")), dialect);+ }if (dialect.equals("io.onedev.server.persistence.PostgreSQLDialect")) {assertTrue(sql.stream().anyMatch(command -> command.contains(" bytea")));assertTrue(sql.stream().noneMatch(command -> command.contains(" oid")));