From 12e993729c0032d077af8196b846949bc471b69e Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Fri, 18 Feb 2022 10:35:27 +0100
Subject: [PATCH] automatische Ermittlung von columnDefs

---
 .../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 ++++++++
 .../test/resources/migrationtest/dbinit/db2luw/1.4.sql    | 1 +
 .../src/test/resources/migrationtest/dbinit/h2/1.4.sql    | 1 +
 .../src/test/resources/migrationtest/dbinit/hana/1.4.sql  | 1 +
 .../test/resources/migrationtest/dbinit/hsqldb/1.4.sql    | 1 +
 .../test/resources/migrationtest/dbinit/mariadb/1.4.sql   | 1 +
 .../src/test/resources/migrationtest/dbinit/mysql/1.4.sql | 1 +
 .../test/resources/migrationtest/dbinit/mysql55/1.4.sql   | 1 +
 .../test/resources/migrationtest/dbinit/oracle/1.4.sql    | 1 +
 .../test/resources/migrationtest/dbinit/postgres/1.4.sql  | 1 +
 .../test/resources/migrationtest/dbinit/sqlite/1.4.sql    | 1 +
 .../resources/migrationtest/dbinit/sqlserver17/1.4.sql    | 1 +
 .../test/resources/migrationtest/dbinit/yugabyte/1.4.sql  | 1 +
 .../migrationtest/dbmigration/db2luw/1.0__initial.sql     | 2 +-
 .../dbmigration/db2luw/1.2__dropsFor_1.1.sql              | 2 +-
 .../resources/migrationtest/dbmigration/db2luw/1.3.sql    | 1 +
 .../migrationtest/dbmigration/db2luw/idx_db2.migrations   | 6 +++---
 .../migrationtest/dbmigration/h2/1.0__initial.sql         | 2 +-
 .../migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql    | 2 +-
 .../test/resources/migrationtest/dbmigration/h2/1.3.sql   | 1 +
 .../migrationtest/dbmigration/h2/idx_h2.migrations        | 6 +++---
 .../migrationtest/dbmigration/hana/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/hana/1.3.sql | 1 +
 .../migrationtest/dbmigration/hana/idx_hana.migrations    | 6 +++---
 .../migrationtest/dbmigration/hsqldb/1.0__initial.sql     | 2 +-
 .../dbmigration/hsqldb/1.2__dropsFor_1.1.sql              | 2 +-
 .../resources/migrationtest/dbmigration/hsqldb/1.3.sql    | 1 +
 .../dbmigration/hsqldb/idx_hsqldb.migrations              | 6 +++---
 .../migrationtest/dbmigration/mariadb/1.0__initial.sql    | 2 +-
 .../dbmigration/mariadb/1.2__dropsFor_1.1.sql             | 2 +-
 .../resources/migrationtest/dbmigration/mariadb/1.3.sql   | 1 +
 .../dbmigration/mariadb/idx_mariadb.migrations            | 6 +++---
 .../dbmigration/model/1.0__initial.model.xml              | 2 +-
 .../migrationtest/dbmigration/model/1.1.model.xml         | 2 +-
 .../dbmigration/model/1.2__dropsFor_1.1.model.xml         | 2 +-
 .../migrationtest/dbmigration/model/1.3.model.xml         | 1 +
 .../migrationtest/dbmigration/mysql/1.0__initial.sql      | 2 +-
 .../migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql | 2 +-
 .../resources/migrationtest/dbmigration/mysql/1.3.sql     | 1 +
 .../migrationtest/dbmigration/mysql/idx_mysql.migrations  | 6 +++---
 .../migrationtest/dbmigration/mysql55/1.0__initial.sql    | 2 +-
 .../dbmigration/mysql55/1.2__dropsFor_1.1.sql             | 2 +-
 .../resources/migrationtest/dbmigration/mysql55/1.3.sql   | 1 +
 .../dbmigration/mysql55/idx_mysql.migrations              | 6 +++---
 .../migrationtest/dbmigration/oracle/1.0__initial.sql     | 2 +-
 .../dbmigration/oracle/1.2__dropsFor_1.1.sql              | 2 +-
 .../resources/migrationtest/dbmigration/oracle/1.3.sql    | 1 +
 .../dbmigration/oracle/idx_oracle.migrations              | 6 +++---
 .../migrationtest/dbmigration/postgres/1.0__initial.sql   | 2 +-
 .../dbmigration/postgres/1.2__dropsFor_1.1.sql            | 2 +-
 .../resources/migrationtest/dbmigration/postgres/1.3.sql  | 1 +
 .../dbmigration/postgres/idx_postgres.migrations          | 6 +++---
 .../migrationtest/dbmigration/sqlite/1.0__initial.sql     | 2 +-
 .../dbmigration/sqlite/1.2__dropsFor_1.1.sql              | 2 +-
 .../resources/migrationtest/dbmigration/sqlite/1.3.sql    | 1 +
 .../dbmigration/sqlite/idx_sqlite.migrations              | 6 +++---
 .../dbmigration/sqlserver17/1.0__initial.sql              | 2 +-
 .../dbmigration/sqlserver17/1.2__dropsFor_1.1.sql         | 2 +-
 .../migrationtest/dbmigration/sqlserver17/1.3.sql         | 1 +
 .../dbmigration/sqlserver17/idx_sqlserver.migrations      | 6 +++---
 .../migrationtest/dbmigration/yugabyte/1.0__initial.sql   | 2 +-
 .../dbmigration/yugabyte/1.2__dropsFor_1.1.sql            | 2 +-
 .../resources/migrationtest/dbmigration/yugabyte/1.3.sql  | 1 +
 .../dbmigration/yugabyte/idx_yugabyte.migrations          | 6 +++---
 67 files changed, 105 insertions(+), 65 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 abc15fabe..2e4247bf8 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 fed2fb308..c579161eb 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
@@ -9,9 +9,12 @@ import io.ebean.annotation.Tablespace;
 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
@@ -45,8 +48,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 8ebd0776a..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
@@ -5,11 +5,15 @@ import io.ebean.annotation.EnumValue;
 import io.ebean.annotation.Index;
 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
@@ -41,6 +45,10 @@ public class EBasic {
 
   @Size(max=127)
   String description;
+  
+  @Lob
+  @Column(columnDefinition = "db2;blob(64M);")
+  File descriptionFile;
 
   Timestamp someDate;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql
index 340fd3334..79302cc31 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              blob(64M),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql
index ea6345742..04e2eec93 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql
index c4c4483c9..3cfdb2663 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql
@@ -60,6 +60,7 @@ create column table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql
index f412cf6b5..a9f62e162 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/mariadb/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/mariadb/1.4.sql
index dc56e15e9..2ca871a5b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/mariadb/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/mariadb/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              longblob,
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql
index 299434e91..f58076577 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              longblob,
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql
index f6134f219..4bdfb3810 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              longblob,
   some_date                     datetime,
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql
index d0b79a1cc..7f14bea85 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar2(1) default 'N' not null,
   name                          varchar2(127),
   description                   varchar2(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   number(1) default 0 not null,
   old_boolean2                  number(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql
index 7eadc584c..e3ddcde2f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              bytea,
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql
index 533249ed9..961185b94 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql
@@ -62,6 +62,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   int default 0 not null,
   old_boolean2                  int,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql
index a6653f5c1..196403ef3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql
@@ -68,6 +68,7 @@ create table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
+  description_file              image,
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/yugabyte/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/yugabyte/1.4.sql
index 53f009767..dd419cee4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbinit/yugabyte/1.4.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbinit/yugabyte/1.4.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description_file              bytea,
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
index 7780238f0..6d8863446 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  blob(64M),
+  description_file              blob(64M),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql
index 994c1c20c..0a298bb91 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
index 597876255..318f45de8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
@@ -94,6 +94,7 @@ end if;
 end$$;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file blob(64M);
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
index 1e639e6a8..a7f5f4887 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
@@ -1,8 +1,8 @@
 -1602289007,    I__create_tablespaces.sql
-1822640619,     1.0__initial.sql
+-366797192,     1.0__initial.sql
 2079409430,     1.1.sql
-327260977,      1.2__dropsFor_1.1.sql
--1291483335,    1.3.sql
+2051718263,     1.2__dropsFor_1.1.sql
+-746953026,     1.3.sql
 1293885677,     1.4__dropsFor_1.3.sql
 -133543359,     R__db2_explain_tables.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
index 19f353e7f..af98aa479 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(227),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql
index d0d876e15..d19ef84f0 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql
@@ -3,7 +3,7 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
index a1d6ccad1..b96413090 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
@@ -36,6 +36,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file blob;
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
index a99a1d97f..a91fe3b62 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
@@ -1,7 +1,7 @@
--1018429770,    1.0__initial.sql
+817061778,      1.0__initial.sql
 1409369419,     1.1.sql
--1904864828,    1.2__dropsFor_1.1.sql
--1513154593,    1.3.sql
+-1095443625,    1.2__dropsFor_1.1.sql
+62715852,       1.3.sql
 1549130952,     1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
index aee46f613..38bc72854 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
@@ -60,7 +60,7 @@ create column table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
-  description2                  nvarchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql
index 64f40e605..c50f9687c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-CALL usp_ebean_drop_column('migtest_e_basic', 'description2');
+CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
index 9e3ba6f9f..8090b369c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
@@ -46,6 +46,7 @@ $$;
 update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint  fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter ( user_id integer default 23 not null);
+alter table migtest_e_basic add ( description_file blob);
 alter table migtest_e_basic add ( old_boolean boolean default false not null);
 alter table migtest_e_basic add ( old_boolean2 boolean);
 alter table migtest_e_basic add ( eref_id integer);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
index a9537f7d5..8f3461ab1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
@@ -1,7 +1,7 @@
--809467006,     1.0__initial.sql
+513351138,      1.0__initial.sql
 -1152055114,    1.1.sql
-1569252375,     1.2__dropsFor_1.1.sql
-1566488731,     1.3.sql
+1830946249,     1.2__dropsFor_1.1.sql
+1073423108,     1.3.sql
 201970227,      1.4__dropsFor_1.3.sql
 1906063401,     R__order_views_hana.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
index bfd24e3b1..ad740f297 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql
index bfe2be7bb..f38f547e1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
index f7f307719..ebdeba1c0 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
@@ -31,6 +31,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file blob;
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
index 96334f2ea..f9096bcde 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
@@ -1,7 +1,7 @@
-1113607799,     1.0__initial.sql
+1469726733,     1.0__initial.sql
 -865579750,     1.1.sql
-2029151368,     1.2__dropsFor_1.1.sql
--2039573992,    1.3.sql
+-2077736415,    1.2__dropsFor_1.1.sql
+-982162181,     1.3.sql
 -1763496614,    1.4__dropsFor_1.3.sql
 861001272,      R__order_views_hsqldb.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
index 1d2a9a5b8..ea67bcb04 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              longblob,
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql
index e92aaf712..70da35eb5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-CALL usp_ebean_drop_column('migtest_e_basic', 'description2');
+CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
index 5930c283a..c3f1dd68f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
@@ -26,6 +26,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop foreign key fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter user_id set default 23;
 alter table migtest_e_basic modify user_id integer not null;
+alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
index 0d2f8e861..d7958ff29 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
@@ -1,8 +1,8 @@
 1835064798,     I__create_procs.sql
-629411155,      1.0__initial.sql
+-616900688,     1.0__initial.sql
 128637084,      1.1.sql
--1078955818,    1.2__dropsFor_1.1.sql
--1957738355,    1.3.sql
+-2098746494,    1.2__dropsFor_1.1.sql
+-1744111309,    1.3.sql
 930722740,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
index ecb6d8163..8bd06fa66 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
@@ -43,7 +43,7 @@
             <column name="status2" type="varchar(1)" defaultValue="'N'" notnull="true" checkConstraint="check ( status2 in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status2"/>
             <column name="name" type="varchar(127)"/>
             <column name="description" type="varchar(127)"/>
-            <column name="description2" type="db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)"/>
+            <column name="description_file" type="db2;blob(64M);blob"/>
             <column name="some_date" type="timestamp"/>
             <column name="old_boolean" type="boolean" defaultValue="false" notnull="true"/>
             <column name="old_boolean2" type="boolean"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
index 96a9f8dfd..fa5ff9b30 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
@@ -113,7 +113,7 @@
         <dropIndex indexName="ix_migtest_oto_child_lowername" tableName="migtest_oto_child" platforms="POSTGRES"/>
     </changeSet>
     <changeSet type="pendingDrops">
-        <dropColumn columnName="description2" tableName="migtest_e_basic"/>
+        <dropColumn columnName="description_file" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean2" tableName="migtest_e_basic"/>
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml
index 19ff281e3..ff94a6767 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
     <changeSet type="apply" dropsFor="1.1">
-        <dropColumn columnName="description2" tableName="migtest_e_basic"/>
+        <dropColumn columnName="description_file" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean" tableName="migtest_e_basic"/>
         <dropColumn columnName="old_boolean2" tableName="migtest_e_basic"/>
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
index c6b567592..d607a5438 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
@@ -11,6 +11,7 @@
         <alterColumn columnName="description" tableName="migtest_e_basic" dropUnique="uq_migtest_e_basic_description"/>
         <alterColumn columnName="user_id" tableName="migtest_e_basic" currentType="integer" defaultValue="23" notnull="true" currentNotnull="false" dropForeignKey="fk_migtest_e_basic_user_id" dropForeignKeyIndex="ix_migtest_e_basic_user_id"/>
         <addColumn tableName="migtest_e_basic">
+            <column name="description_file" type="db2;blob(64M);blob"/>
             <column name="old_boolean" type="boolean" defaultValue="false" notnull="true"/>
             <column name="old_boolean2" type="boolean"/>
             <column name="eref_id" type="integer" references="migtest_e_ref.id" foreignKeyName="fk_migtest_e_basic_eref_id" foreignKeyIndex="ix_migtest_e_basic_eref_id"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
index c4ae8fe79..92ceaaf21 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              longblob,
   some_date                     datetime(6),
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql
index 3e6410977..68f5324da 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql
@@ -3,7 +3,7 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-CALL usp_ebean_drop_column('migtest_e_basic', 'description2');
+CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
index 6953c06f5..b3d9845a5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
@@ -31,6 +31,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop foreign key fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter user_id set default 23;
 alter table migtest_e_basic modify user_id integer not null;
+alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
index 127648cc0..5dbbf2fd2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
@@ -1,8 +1,8 @@
 1835064798,     I__create_procs.sql
--625233983,     1.0__initial.sql
+890673066,      1.0__initial.sql
 -1627573867,    1.1.sql
-426154419,      1.2__dropsFor_1.1.sql
--380371830,     1.3.sql
+1986189381,     1.2__dropsFor_1.1.sql
+798979911,      1.3.sql
 -1373040825,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
index a7229076e..a0d087761 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              longblob,
   some_date                     datetime,
   old_boolean                   tinyint(1) default 0 not null,
   old_boolean2                  tinyint(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql
index 5f1542ee6..7919e91da 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql
@@ -3,7 +3,7 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
index 6953c06f5..b3d9845a5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
@@ -31,6 +31,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop foreign key fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter user_id set default 23;
 alter table migtest_e_basic modify user_id integer not null;
+alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
index 41928335d..adf4d2126 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
@@ -1,7 +1,7 @@
--753661440,     1.0__initial.sql
+881444156,      1.0__initial.sql
 -1627573867,    1.1.sql
-741043957,      1.2__dropsFor_1.1.sql
--380371830,     1.3.sql
+1720062531,     1.2__dropsFor_1.1.sql
+798979911,      1.3.sql
 -724776884,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
index 5dd163926..4d151f191 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar2(1) default 'N' not null,
   name                          varchar2(127),
   description                   varchar2(127),
-  description2                  varchar2(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   number(1) default 0 not null,
   old_boolean2                  number(1),
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql
index 68847f4cc..ee9cc6325 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
index ceafdbcff..3dc30312f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
@@ -31,6 +31,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
 alter table migtest_e_basic modify user_id default 23;
 alter table migtest_e_basic modify user_id not null;
+alter table migtest_e_basic add description_file blob;
 alter table migtest_e_basic add old_boolean number(1) default 0 not null;
 alter table migtest_e_basic add old_boolean2 number(1);
 alter table migtest_e_basic add eref_id number(10);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
index f549ab768..86e8f1206 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
@@ -1,7 +1,7 @@
--1818229777,    1.0__initial.sql
+1732845114,     1.0__initial.sql
 -411370666,     1.1.sql
-521762942,      1.2__dropsFor_1.1.sql
-483114276,      1.3.sql
+-1698942539,    1.2__dropsFor_1.1.sql
+1355736100,     1.3.sql
 -629809805,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
index c181e29d5..9dfbbd842 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              bytea,
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql
index c98a15504..35a7e2b4a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql
@@ -3,7 +3,7 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
index dbcb50aac..79cc955b5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
@@ -36,6 +36,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table if exists migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file bytea;
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
index 8870c305e..36d862b83 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
@@ -1,7 +1,7 @@
-1713516005,     1.0__initial.sql
+-757334590,     1.0__initial.sql
 1548995254,     1.1.sql
--1155149746,    1.2__dropsFor_1.1.sql
--1798982281,    1.3.sql
+1360771849,     1.2__dropsFor_1.1.sql
+592037553,      1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
index d6641c368..8afe5c89e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
@@ -62,7 +62,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              blob,
   some_date                     timestamp,
   old_boolean                   int default 0 not null,
   old_boolean2                  int,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql
index 6ca9bbadc..bf1e082c9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
index 3812d6e38..fa47a26c1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
@@ -29,6 +29,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file blob;
 alter table migtest_e_basic add column old_boolean int default 0 not null;
 alter table migtest_e_basic add column old_boolean2 int;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
index 10931cc54..9909a4923 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
@@ -1,7 +1,7 @@
-1636161797,     1.0__initial.sql
+181087169,      1.0__initial.sql
 -1974335860,    1.1.sql
-519662611,      1.2__dropsFor_1.1.sql
--1764531063,    1.3.sql
+628353409,      1.2__dropsFor_1.1.sql
+1537582239,     1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 2034589659,     R__order_views_sqlite.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
index 3c089ee50..2fa18fa18 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
@@ -68,7 +68,7 @@ create table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
-  description2                  nvarchar(227),
+  description_file              image,
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql
index e88590502..a49969d1e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql
@@ -1,6 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
-EXEC usp_ebean_drop_column migtest_e_basic, description2;
+EXEC usp_ebean_drop_column migtest_e_basic, description_file;
 
 EXEC usp_ebean_drop_column migtest_e_basic, old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
index 76564b73c..fde85d001 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
@@ -32,6 +32,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 IF OBJECT_ID('fk_migtest_e_basic_user_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id;
 alter table migtest_e_basic add default 23 for user_id;
 alter table migtest_e_basic alter column user_id integer not null;
+alter table migtest_e_basic add description_file image;
 alter table migtest_e_basic add old_boolean bit default 0 not null;
 alter table migtest_e_basic add old_boolean2 bit;
 alter table migtest_e_basic add eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
index e6a71e48d..95435eb0b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
@@ -1,8 +1,8 @@
 -2122378240,    I__create_procs.sql
--1036149520,    1.0__initial.sql
+-813787447,     1.0__initial.sql
 -898063858,     1.1.sql
-1470614292,     1.2__dropsFor_1.1.sql
--1791137342,    1.3.sql
+1019731053,     1.2__dropsFor_1.1.sql
+-494373130,     1.3.sql
 -1335541264,    1.4__dropsFor_1.3.sql
 1607822082,     R__order_views_mssql.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
index 11f764f24..88e5ba9cf 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
@@ -60,7 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
-  description2                  varchar(127),
+  description_file              bytea,
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql
index c98a15504..35a7e2b4a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql
@@ -3,7 +3,7 @@
 drop view if exists migtest_e_history2_with_history;
 
 -- apply changes
-alter table migtest_e_basic drop column description2;
+alter table migtest_e_basic drop column description_file;
 
 alter table migtest_e_basic drop column old_boolean;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
index d0e444fc4..5a5ef8226 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
@@ -36,6 +36,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table if exists migtest_e_basic drop constraint if exists fk_migtest_e_basic_user_id;
 alter table migtest_e_basic alter column user_id set default 23;
 alter table migtest_e_basic alter column user_id set not null;
+alter table migtest_e_basic add column description_file bytea;
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
index 4e6378338..0d28a6487 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
@@ -1,7 +1,7 @@
-603721056,      1.0__initial.sql
+78788203,       1.0__initial.sql
 1985413053,     1.1.sql
--1155149746,    1.2__dropsFor_1.1.sql
-2034977550,     1.3.sql
+1360771849,     1.2__dropsFor_1.1.sql
+-1862150074,    1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql