From c2e4f862bc32377b7a8b9f172339fc273c7c3954 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Fri, 18 Feb 2022 10:02:48 +0100
Subject: [PATCH] default columnDef should be calculated from ebean

---
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java | 3 +++
 ebean-test/src/test/java/misc/migration/v1_0/EBasic.java  | 8 ++++++--
 ebean-test/src/test/java/misc/migration/v1_2/EBasic.java  | 8 ++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 72379b232..e83804be1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -992,6 +992,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    */
   public String renderDbType(DbPlatformType dbType, boolean strict) {
     if (dbColumnDefn != null) {
+      if(dbColumnDefn.endsWith(";")) {
+        return dbColumnDefn + dbType.renderType(dbLength, dbScale, strict);
+      }
       return dbColumnDefn;
     }
     return dbType.renderType(dbLength, dbScale, strict);
diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
index abc55e33a..0a2a3d7da 100644
--- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
+++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
@@ -8,9 +8,12 @@ import io.ebean.annotation.NotNull;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.Size;
+
+import java.io.File;
 import java.sql.Timestamp;
 
 @Entity
@@ -43,8 +46,9 @@ public class EBasic {
   @Size(max=127)
   String description;
   
-  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
-  String description2;
+  @Lob
+  @Column(columnDefinition = "db2;blob(64M);")
+  File descriptionFile;
 
   Timestamp someDate;
 
diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java
index 4b10b8c73..7dd688941 100644
--- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java
+++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java
@@ -8,9 +8,12 @@ import io.ebean.annotation.NotNull;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.Size;
+
+import java.io.File;
 import java.sql.Timestamp;
 
 @Entity
@@ -43,8 +46,9 @@ public class EBasic {
   @Size(max=127)
   String description;
   
-  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
-  String description2;
+  @Lob
+  @Column(columnDefinition = "db2;blob(64M);")
+  File descriptionFile;
 
   Timestamp someDate;