From 48e875714b4d236ae47401810da24c019c672714 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Tue, 15 Feb 2022 15:28:05 +0100
Subject: [PATCH 1/7] solution v1

(cherry picked from commit 3d83c6bd0e2bcca6fc04f73ce08983266b9df636)
---
 .../ddlgeneration/platform/PlatformDdl.java   | 22 +++++++++++++++++++
 .../test/java/misc/migration/v1_0/EBasic.java |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 59cf38e0d..36a712122 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.annotation.ConstraintMode;
+import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -24,6 +25,7 @@ import io.ebeaninternal.dbmigration.model.MTable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Controls the DDL generation for a specific database platform.
@@ -317,12 +319,32 @@ public class PlatformDdl {
     if (type == null) {
       return null;
     }
+    
+    type = extract(type);
+    
     if (type.contains("[]")) {
       return convertArrayType(type);
     }
     return typeConverter.convert(type);
   }
 
+  // if columnType is different for different platforms, use pattern
+  // @Column(columnDefinition = PLATFORM1;DEFINITION1;PLATFORM2;DEFINITON2;DEFINITON-DEFAULT)
+  // e.g. @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
+  private String extract(String type) {
+    String[] tmp = type.split(";");
+    assert tmp.length % 2 == 1;
+    for (int i = 0; i < tmp.length - 2; i+=2) {
+      String[] platforms = tmp[i].split(",");
+      for (String plat : platforms) {
+        if (platform.isPlatform(Platform.valueOf(plat.toUpperCase(Locale.ENGLISH)))) {
+          return tmp[i+1];
+        }
+      }
+    }
+    return tmp[tmp.length-1]; // else
+  }
+
   /**
    * Convert the logical array type to a db platform specific type to support the array data.
    */
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 6e895a2f1..c90e00423 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
@@ -5,6 +5,7 @@ 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.ManyToOne;
@@ -39,7 +40,8 @@ public class EBasic {
   @Size(max=127)
   String name;
 
-  @Size(max=127)
+ // @Size(max=127)
+  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
   String description;
 
   Timestamp someDate;

From 3ab7ebe5e68109fe02fe40908d520ac878e42121 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Thu, 17 Feb 2022 08:14:51 +0100
Subject: [PATCH 2/7] new property for test

---
 ebean-test/src/test/java/misc/migration/v1_0/EBasic.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 c90e00423..abc55e33a 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
@@ -40,9 +40,11 @@ public class EBasic {
   @Size(max=127)
   String name;
 
- // @Size(max=127)
-  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
+  @Size(max=127)
   String description;
+  
+  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
+  String description2;
 
   Timestamp someDate;
 

From c6fa60f28c2454e08ac22e42904ac3453e589f16 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Thu, 17 Feb 2022 08:16:35 +0100
Subject: [PATCH 3/7] migrations

---
 .../migrationtest/dbmigration/clickhouse/1.0__initial.sql     | 1 +
 .../dbmigration/clickhouse/1.2__dropsFor_1.1.sql              | 2 ++
 .../dbmigration/clickhouse/idx_clickhouse.migrations          | 4 ++--
 .../migrationtest/dbmigration/cockroach/1.0__initial.sql      | 1 +
 .../migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql | 2 ++
 .../dbmigration/cockroach/idx_cockroach.migrations            | 4 ++--
 .../migrationtest/dbmigration/db2fori/1.0__initial.sql        | 1 +
 .../migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql   | 2 ++
 .../migrationtest/dbmigration/db2fori/idx_db2.migrations      | 4 ++--
 .../migrationtest/dbmigration/db2legacy/1.0__initial.sql      | 1 +
 .../migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql | 2 ++
 .../migrationtest/dbmigration/db2legacy/idx_db2.migrations    | 4 ++--
 .../migrationtest/dbmigration/db2luw/1.0__initial.sql         | 1 +
 .../migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql    | 2 ++
 .../migrationtest/dbmigration/db2luw/idx_db2.migrations       | 4 ++--
 .../migrationtest/dbmigration/db2zos/1.0__initial.sql         | 1 +
 .../migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql    | 2 ++
 .../migrationtest/dbmigration/db2zos/idx_db2.migrations       | 4 ++--
 .../migrationtest/dbmigration/generic/1.0__initial.sql        | 1 +
 .../migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql   | 2 ++
 .../migrationtest/dbmigration/generic/idx_generic.migrations  | 4 ++--
 .../resources/migrationtest/dbmigration/h2/1.0__initial.sql   | 1 +
 .../migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql        | 2 ++
 .../resources/migrationtest/dbmigration/h2/idx_h2.migrations  | 4 ++--
 .../resources/migrationtest/dbmigration/hana/1.0__initial.sql | 1 +
 .../migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql      | 2 ++
 .../migrationtest/dbmigration/hana/idx_hana.migrations        | 4 ++--
 .../migrationtest/dbmigration/hsqldb/1.0__initial.sql         | 1 +
 .../migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql    | 2 ++
 .../migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations    | 4 ++--
 .../dbmigration/mariadb-noprocs/1.0__initial.sql              | 1 +
 .../dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql         | 2 ++
 .../dbmigration/mariadb-noprocs/idx_mariadb.migrations        | 4 ++--
 .../migrationtest/dbmigration/mariadb/1.0__initial.sql        | 1 +
 .../migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql   | 2 ++
 .../migrationtest/dbmigration/mariadb/idx_mariadb.migrations  | 4 ++--
 .../migrationtest/dbmigration/model/1.0__initial.model.xml    | 1 +
 .../resources/migrationtest/dbmigration/model/1.1.model.xml   | 1 +
 .../dbmigration/model/1.2__dropsFor_1.1.model.xml             | 1 +
 .../migrationtest/dbmigration/mysql/1.0__initial.sql          | 1 +
 .../migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql     | 2 ++
 .../migrationtest/dbmigration/mysql/idx_mysql.migrations      | 4 ++--
 .../migrationtest/dbmigration/mysql55/1.0__initial.sql        | 1 +
 .../migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql   | 2 ++
 .../migrationtest/dbmigration/mysql55/idx_mysql.migrations    | 4 ++--
 .../migrationtest/dbmigration/nuodb/1.0__initial.sql          | 1 +
 .../migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql     | 2 ++
 .../migrationtest/dbmigration/nuodb/idx_nuodb.migrations      | 4 ++--
 .../migrationtest/dbmigration/oracle/1.0__initial.sql         | 1 +
 .../migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql    | 2 ++
 .../migrationtest/dbmigration/oracle/idx_oracle.migrations    | 4 ++--
 .../migrationtest/dbmigration/oracle11/1.0__initial.sql       | 1 +
 .../migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql  | 2 ++
 .../migrationtest/dbmigration/oracle11/idx_oracle.migrations  | 4 ++--
 .../migrationtest/dbmigration/postgres/1.0__initial.sql       | 1 +
 .../migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql  | 2 ++
 .../dbmigration/postgres/idx_postgres.migrations              | 4 ++--
 .../migrationtest/dbmigration/postgres9/1.0__initial.sql      | 1 +
 .../migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql | 2 ++
 .../dbmigration/postgres9/idx_postgres.migrations             | 4 ++--
 .../migrationtest/dbmigration/sqlanywhere/1.0__initial.sql    | 1 +
 .../dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql             | 2 ++
 .../dbmigration/sqlanywhere/idx_sqlanywhere.migrations        | 4 ++--
 .../migrationtest/dbmigration/sqlite/1.0__initial.sql         | 1 +
 .../migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql    | 2 ++
 .../migrationtest/dbmigration/sqlite/idx_sqlite.migrations    | 4 ++--
 .../migrationtest/dbmigration/sqlserver16/1.0__initial.sql    | 1 +
 .../dbmigration/sqlserver16/1.2__dropsFor_1.1.sql             | 2 ++
 .../dbmigration/sqlserver16/idx_sqlserver.migrations          | 4 ++--
 .../migrationtest/dbmigration/sqlserver17/1.0__initial.sql    | 1 +
 .../dbmigration/sqlserver17/1.2__dropsFor_1.1.sql             | 2 ++
 .../dbmigration/sqlserver17/idx_sqlserver.migrations          | 4 ++--
 .../migrationtest/dbmigration/yugabyte/1.0__initial.sql       | 1 +
 .../migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql  | 2 ++
 .../dbmigration/yugabyte/idx_yugabyte.migrations              | 4 ++--
 75 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
index e4afafaad..c5eddf5ad 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
@@ -51,6 +51,7 @@ create table migtest_e_basic (
   status2                       String default 'N',
   name                          String,
   description                   String,
+  description2                  String,
   some_date                     DateTime,
   old_boolean                   UInt8 default false,
   old_boolean2                  UInt8,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql
index 3f8f468ba..6ca9bbadc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
index 965f25509..b948dd31c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
@@ -1,6 +1,6 @@
-79609527,       1.0__initial.sql
+-429555051,     1.0__initial.sql
 1864520180,     1.1.sql
-1359055889,     1.2__dropsFor_1.1.sql
+519662611,      1.2__dropsFor_1.1.sql
 -715327671,     1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
index 371a3fad1..e0719c8a8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql
index e88e788c0..b50b1071a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
index 1d35441b7..2a2b4e44f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
@@ -1,6 +1,6 @@
--487576609,     1.0__initial.sql
+1784035212,     1.0__initial.sql
 -1108404951,    1.1.sql
--91524786,      1.2__dropsFor_1.1.sql
+-979513548,     1.2__dropsFor_1.1.sql
 735879716,      1.3.sql
 676584941,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
index c24736673..4dafd604d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  blob(64M),
   some_date                     timestamp,
   old_boolean                   smallint default 0 default false not null,
   old_boolean2                  smallint default 0,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql
index f7ff8b135..95857c382 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
index 2e0020c0b..30c6b2b8e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
@@ -1,6 +1,6 @@
-545908658,      1.0__initial.sql
+1959738162,     1.0__initial.sql
 -1594597621,    1.1.sql
-578073685,      1.2__dropsFor_1.1.sql
+1791049503,     1.2__dropsFor_1.1.sql
 99025497,       1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
index 049e2affc..7c3f05efa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  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/db2legacy/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql
index f7ff8b135..95857c382 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
index dfc85e553..e50c9477c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
@@ -1,6 +1,6 @@
--1494430232,    1.0__initial.sql
+254148970,      1.0__initial.sql
 -1126979163,    1.1.sql
-578073685,      1.2__dropsFor_1.1.sql
+1791049503,     1.2__dropsFor_1.1.sql
 -183167227,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
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 5d4113a24..4cfd1f6ac 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  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 f7ff8b135..95857c382 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 8622a8c4c..c4559ee6f 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,6 +1,6 @@
-1580812656,     1.0__initial.sql
+662450113,      1.0__initial.sql
 1615151513,     1.1.sql
-578073685,      1.2__dropsFor_1.1.sql
+1791049503,     1.2__dropsFor_1.1.sql
 -1206650320,    1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
index 5d4113a24..4cfd1f6ac 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  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/db2zos/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql
index f7ff8b135..95857c382 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
index 8622a8c4c..c4559ee6f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
@@ -1,6 +1,6 @@
-1580812656,     1.0__initial.sql
+662450113,      1.0__initial.sql
 1615151513,     1.1.sql
-578073685,      1.2__dropsFor_1.1.sql
+1791049503,     1.2__dropsFor_1.1.sql
 -1206650320,    1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
index b8b1952df..abf2a9c91 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql
index 3f8f468ba..6ca9bbadc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
index 0855fc2e1..f487f916b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
@@ -1,6 +1,6 @@
--1827577042,    1.0__initial.sql
+-1383651907,    1.0__initial.sql
 -1825206641,    1.1.sql
-1359055889,     1.2__dropsFor_1.1.sql
+519662611,      1.2__dropsFor_1.1.sql
 297569863,      1.3.sql
 -1045594368,    1.4__dropsFor_1.3.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 1e2a4095f..19f353e7f 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(227),
   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 dea5dde03..d0d876e15 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,6 +3,8 @@
 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 old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 c5bafc1f6..a99a1d97f 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,6 +1,6 @@
--745768926,     1.0__initial.sql
+-1018429770,    1.0__initial.sql
 1409369419,     1.1.sql
-1616986842,     1.2__dropsFor_1.1.sql
+-1904864828,    1.2__dropsFor_1.1.sql
 -1513154593,    1.3.sql
 1549130952,     1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.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 837424e6d..aee46f613 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,6 +60,7 @@ create column table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
+  description2                  nvarchar(127),
   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 a69417f3e..64f40e605 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+CALL usp_ebean_drop_column('migtest_e_basic', 'description2');
+
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
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 521c0c0b7..a9537f7d5 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,6 +1,6 @@
--1536923954,    1.0__initial.sql
+-809467006,     1.0__initial.sql
 -1152055114,    1.1.sql
-562867593,      1.2__dropsFor_1.1.sql
+1569252375,     1.2__dropsFor_1.1.sql
 1566488731,     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 40616be0a..bfd24e3b1 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 6fb11c3a4..bfe2be7bb 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 c754652e1..96334f2ea 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,6 +1,6 @@
-2097980375,     1.0__initial.sql
+1113607799,     1.0__initial.sql
 -865579750,     1.1.sql
--1462014216,    1.2__dropsFor_1.1.sql
+2029151368,     1.2__dropsFor_1.1.sql
 -2039573992,    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-noprocs/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
index dd7505e20..1d2a9a5b8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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-noprocs/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql
index 6fb11c3a4..bfe2be7bb 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
index f862900c1..8c71ab965 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
@@ -1,6 +1,6 @@
-1615386118,     1.0__initial.sql
+629411155,      1.0__initial.sql
 128637084,      1.1.sql
--1462014216,    1.2__dropsFor_1.1.sql
+2029151368,     1.2__dropsFor_1.1.sql
 -1957738355,    1.3.sql
 89701608,       1.4__dropsFor_1.3.sql
 561281075,      R__order_views.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 dd7505e20..1d2a9a5b8 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 a60e90858..e92aaf712 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+CALL usp_ebean_drop_column('migtest_e_basic', 'description2');
+
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
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 4ba501e5d..0d2f8e861 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,7 +1,7 @@
 1835064798,     I__create_procs.sql
-1615386118,     1.0__initial.sql
+629411155,      1.0__initial.sql
 128637084,      1.1.sql
--116088700,     1.2__dropsFor_1.1.sql
+-1078955818,    1.2__dropsFor_1.1.sql
 -1957738355,    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 68661ce4c..3b9f431c8 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,6 +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="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 7754adc51..a87d01c57 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
@@ -110,6 +110,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="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 59bf48a8f..19ff281e3 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,6 +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="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/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
index ce464c473..c4ae8fe79 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 a22adf90b..3e6410977 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,6 +3,8 @@
 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', 'old_boolean');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
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 4bb99f9cb..127648cc0 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,7 +1,7 @@
 1835064798,     I__create_procs.sql
-1075178692,     1.0__initial.sql
+-625233983,     1.0__initial.sql
 -1627573867,    1.1.sql
-1922991807,     1.2__dropsFor_1.1.sql
+426154419,      1.2__dropsFor_1.1.sql
 -380371830,     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 0a76ab174..a7229076e 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 a22adf90b..3e6410977 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,6 +3,8 @@
 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', 'old_boolean');
 
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
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 4ed25ce12..c456088a8 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 @@
 1835064798,     I__create_procs.sql
--1087663151,    1.0__initial.sql
+-753661440,     1.0__initial.sql
 -1627573867,    1.1.sql
-1922991807,     1.2__dropsFor_1.1.sql
+426154419,      1.2__dropsFor_1.1.sql
 -380371830,     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/nuodb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
index a6ef6fb83..52477bd2d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   some_date                     timestamp,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql
index c6e454e20..c33aa5fc1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql
@@ -3,6 +3,8 @@
 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 old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
index a16275206..c79573427 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
@@ -1,6 +1,6 @@
--600390912,     1.0__initial.sql
+-1938088728,    1.0__initial.sql
 667708916,      1.1.sql
--1171866240,    1.2__dropsFor_1.1.sql
+1794931214,     1.2__dropsFor_1.1.sql
 870952105,      1.3.sql
 473283202,      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 09a800c07..5dd163926 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar2(1) default 'N' not null,
   name                          varchar2(127),
   description                   varchar2(127),
+  description2                  varchar2(127),
   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 4f2337db3..68847f4cc 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 784f0c1d5..f549ab768 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,6 +1,6 @@
-1164675950,     1.0__initial.sql
+-1818229777,    1.0__initial.sql
 -411370666,     1.1.sql
-238598298,      1.2__dropsFor_1.1.sql
+521762942,      1.2__dropsFor_1.1.sql
 483114276,      1.3.sql
 -629809805,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
index 8c9b8aefb..89dacfbe7 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
@@ -68,6 +68,7 @@ create table migtest_e_basic (
   status2                       varchar2(1) default 'N' not null,
   name                          varchar2(127),
   description                   varchar2(127),
+  description2                  varchar2(127),
   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/oracle11/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql
index 4f2337db3..68847f4cc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
index 0d92c64be..407f8042b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
@@ -1,6 +1,6 @@
-1839897438,     1.0__initial.sql
+-135608451,     1.0__initial.sql
 1927010726,     1.1.sql
-238598298,      1.2__dropsFor_1.1.sql
+521762942,      1.2__dropsFor_1.1.sql
 1543053715,     1.3.sql
 -629809805,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_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 af08de6d3..c181e29d5 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 c9a6d03e6..c98a15504 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,6 +3,8 @@
 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 old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 38e13bc57..8870c305e 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,6 +1,6 @@
-1329543701,     1.0__initial.sql
+1713516005,     1.0__initial.sql
 1548995254,     1.1.sql
--1861367028,    1.2__dropsFor_1.1.sql
+-1155149746,    1.2__dropsFor_1.1.sql
 -1798982281,    1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
index 3e610644e..cd0cf0f7d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   some_date                     timestamptz,
   old_boolean                   boolean default false not null,
   old_boolean2                  boolean,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql
index c9a6d03e6..c98a15504 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql
@@ -3,6 +3,8 @@
 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 old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
index 370c64f13..d445fd00e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
@@ -1,6 +1,6 @@
-1428934272,     1.0__initial.sql
+-582258071,     1.0__initial.sql
 1253246780,     1.1.sql
--1861367028,    1.2__dropsFor_1.1.sql
+-1155149746,    1.2__dropsFor_1.1.sql
 326342179,      1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
index abe7271bc..ef262f2a9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   some_date                     timestamp,
   old_boolean                   bit default false not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql
index 3f8f468ba..6ca9bbadc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
index 684ce1c07..c3f962ea2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
@@ -1,6 +1,6 @@
-471098770,      1.0__initial.sql
+1714992528,     1.0__initial.sql
 776493598,      1.1.sql
-1359055889,     1.2__dropsFor_1.1.sql
+519662611,      1.2__dropsFor_1.1.sql
 -1656705954,    1.3.sql
 -1045594368,    1.4__dropsFor_1.3.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 1a4944f30..d6641c368 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,6 +62,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 3f8f468ba..6ca9bbadc 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+alter table migtest_e_basic drop column description2;
+
 alter table migtest_e_basic drop column old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 25e367a67..10931cc54 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,6 +1,6 @@
-1429491518,     1.0__initial.sql
+1636161797,     1.0__initial.sql
 -1974335860,    1.1.sql
-1359055889,     1.2__dropsFor_1.1.sql
+519662611,      1.2__dropsFor_1.1.sql
 -1764531063,    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/sqlserver16/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
index 72cd2daf4..33a9e7032 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
@@ -60,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(227),
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql
index b34091486..e88590502 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+EXEC usp_ebean_drop_column migtest_e_basic, description2;
+
 EXEC usp_ebean_drop_column migtest_e_basic, old_boolean;
 
 EXEC usp_ebean_drop_column migtest_e_basic, old_boolean2;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
index 00693e947..6c9a7762a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
@@ -1,7 +1,7 @@
 -2122378240,    I__create_procs.sql
-802205012,      1.0__initial.sql
+-390904708,     1.0__initial.sql
 -1042228916,    1.1.sql
--1805601919,    1.2__dropsFor_1.1.sql
+1470614292,     1.2__dropsFor_1.1.sql
 -807119885,     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/sqlserver17/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
index 13b5da203..3c089ee50 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,6 +68,7 @@ create table migtest_e_basic (
   status2                       nvarchar(1) default 'N' not null,
   name                          nvarchar(127),
   description                   nvarchar(127),
+  description2                  nvarchar(227),
   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 b34091486..e88590502 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,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply changes
+EXEC usp_ebean_drop_column migtest_e_basic, description2;
+
 EXEC usp_ebean_drop_column migtest_e_basic, old_boolean;
 
 EXEC usp_ebean_drop_column migtest_e_basic, old_boolean2;
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 388adffc2..e6a71e48d 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,7 +1,7 @@
 -2122378240,    I__create_procs.sql
--1048913407,    1.0__initial.sql
+-1036149520,    1.0__initial.sql
 -898063858,     1.1.sql
--1805601919,    1.2__dropsFor_1.1.sql
+1470614292,     1.2__dropsFor_1.1.sql
 -1791137342,    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 702b0317d..11f764f24 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,6 +60,7 @@ create table migtest_e_basic (
   status2                       varchar(1) default 'N' not null,
   name                          varchar(127),
   description                   varchar(127),
+  description2                  varchar(127),
   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 c9a6d03e6..c98a15504 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,6 +3,8 @@
 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 old_boolean;
 
 alter table migtest_e_basic drop column old_boolean2;
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 4dd2bc71e..4e6378338 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,6 +1,6 @@
--1449071956,    1.0__initial.sql
+603721056,      1.0__initial.sql
 1985413053,     1.1.sql
--1861367028,    1.2__dropsFor_1.1.sql
+-1155149746,    1.2__dropsFor_1.1.sql
 2034977550,     1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql

From e3980a14a2d7fe441c433d24361e7180e88f4698 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Thu, 17 Feb 2022 09:52:23 +0100
Subject: [PATCH 4/7] review changes

---
 .../ddlgeneration/platform/PlatformDdl.java            | 10 ++++++----
 .../src/test/java/misc/migration/v1_2/EBasic.java      |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 36a712122..d9030a07b 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -333,16 +333,18 @@ public class PlatformDdl {
   // e.g. @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
   private String extract(String type) {
     String[] tmp = type.split(";");
-    assert tmp.length % 2 == 1;
-    for (int i = 0; i < tmp.length - 2; i+=2) {
+    if (tmp.length % 2 == 0) {
+      throw new IllegalArgumentException("You need an odd number of arguments. See Issue #2559 for details");
+    }
+    for (int i = 0; i < tmp.length - 2; i += 2) {
       String[] platforms = tmp[i].split(",");
       for (String plat : platforms) {
         if (platform.isPlatform(Platform.valueOf(plat.toUpperCase(Locale.ENGLISH)))) {
-          return tmp[i+1];
+          return tmp[i + 1];
         }
       }
     }
-    return tmp[tmp.length-1]; // else
+    return tmp[tmp.length - 1]; // else
   }
 
   /**
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..4b10b8c73 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,6 +5,7 @@ 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.ManyToOne;
@@ -41,6 +42,9 @@ public class EBasic {
 
   @Size(max=127)
   String description;
+  
+  @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)")
+  String description2;
 
   Timestamp someDate;
 

From 137a7950ffbd4972ff6ebde8302b575f8076aafd Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Thu, 17 Feb 2022 09:53:26 +0100
Subject: [PATCH 5/7] new migrations

---
 .../test/resources/migrationtest/dbmigration/clickhouse/1.3.sql | 1 +
 .../dbmigration/clickhouse/idx_clickhouse.migrations            | 2 +-
 .../test/resources/migrationtest/dbmigration/cockroach/1.3.sql  | 1 +
 .../dbmigration/cockroach/idx_cockroach.migrations              | 2 +-
 .../test/resources/migrationtest/dbmigration/db2fori/1.3.sql    | 1 +
 .../migrationtest/dbmigration/db2fori/idx_db2.migrations        | 2 +-
 .../test/resources/migrationtest/dbmigration/db2legacy/1.3.sql  | 1 +
 .../migrationtest/dbmigration/db2legacy/idx_db2.migrations      | 2 +-
 .../src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql | 1 +
 .../migrationtest/dbmigration/db2luw/idx_db2.migrations         | 2 +-
 .../src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql | 1 +
 .../migrationtest/dbmigration/db2zos/idx_db2.migrations         | 2 +-
 .../test/resources/migrationtest/dbmigration/generic/1.3.sql    | 1 +
 .../migrationtest/dbmigration/generic/idx_generic.migrations    | 2 +-
 .../src/test/resources/migrationtest/dbmigration/h2/1.3.sql     | 1 +
 .../resources/migrationtest/dbmigration/h2/idx_h2.migrations    | 2 +-
 .../src/test/resources/migrationtest/dbmigration/hana/1.3.sql   | 1 +
 .../migrationtest/dbmigration/hana/idx_hana.migrations          | 2 +-
 .../src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql | 1 +
 .../migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations      | 2 +-
 .../resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql | 1 +
 .../dbmigration/mariadb-noprocs/idx_mariadb.migrations          | 2 +-
 .../test/resources/migrationtest/dbmigration/mariadb/1.3.sql    | 1 +
 .../migrationtest/dbmigration/mariadb/idx_mariadb.migrations    | 2 +-
 .../resources/migrationtest/dbmigration/model/1.3.model.xml     | 1 +
 .../src/test/resources/migrationtest/dbmigration/mysql/1.3.sql  | 1 +
 .../migrationtest/dbmigration/mysql/idx_mysql.migrations        | 2 +-
 .../test/resources/migrationtest/dbmigration/mysql55/1.3.sql    | 1 +
 .../migrationtest/dbmigration/mysql55/idx_mysql.migrations      | 2 +-
 .../src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql  | 1 +
 .../migrationtest/dbmigration/nuodb/idx_nuodb.migrations        | 2 +-
 .../src/test/resources/migrationtest/dbmigration/oracle/1.3.sql | 1 +
 .../migrationtest/dbmigration/oracle/idx_oracle.migrations      | 2 +-
 .../test/resources/migrationtest/dbmigration/oracle11/1.3.sql   | 1 +
 .../migrationtest/dbmigration/oracle11/idx_oracle.migrations    | 2 +-
 .../test/resources/migrationtest/dbmigration/postgres/1.3.sql   | 1 +
 .../migrationtest/dbmigration/postgres/idx_postgres.migrations  | 2 +-
 .../test/resources/migrationtest/dbmigration/postgres9/1.3.sql  | 1 +
 .../migrationtest/dbmigration/postgres9/idx_postgres.migrations | 2 +-
 .../resources/migrationtest/dbmigration/sqlanywhere/1.3.sql     | 1 +
 .../dbmigration/sqlanywhere/idx_sqlanywhere.migrations          | 2 +-
 .../src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql | 1 +
 .../migrationtest/dbmigration/sqlite/idx_sqlite.migrations      | 2 +-
 .../resources/migrationtest/dbmigration/sqlserver16/1.3.sql     | 1 +
 .../dbmigration/sqlserver16/idx_sqlserver.migrations            | 2 +-
 .../resources/migrationtest/dbmigration/sqlserver17/1.3.sql     | 1 +
 .../dbmigration/sqlserver17/idx_sqlserver.migrations            | 2 +-
 .../test/resources/migrationtest/dbmigration/yugabyte/1.3.sql   | 1 +
 .../migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations  | 2 +-
 49 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
index a9becf417..8e0ffdef5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
@@ -21,6 +21,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 update migtest_e_basic set user_id = 23 where user_id is null;
 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 description2 String;
 alter table migtest_e_basic add column old_boolean UInt8 default false;
 alter table migtest_e_basic add column old_boolean2 UInt8;
 alter table migtest_e_basic add column eref_id UInt32;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
index b948dd31c..8d0005bd9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
@@ -1,6 +1,6 @@
 -429555051,     1.0__initial.sql
 1864520180,     1.1.sql
 519662611,      1.2__dropsFor_1.1.sql
--715327671,     1.3.sql
+-1108954500,    1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
index 3784bbb0c..0b6ce1041 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
@@ -31,6 +31,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 description2 varchar(127);
 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/cockroach/idx_cockroach.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
index 2a2b4e44f..e23ea759d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
@@ -1,7 +1,7 @@
 1784035212,     1.0__initial.sql
 -1108404951,    1.1.sql
 -979513548,     1.2__dropsFor_1.1.sql
-735879716,      1.3.sql
+-162585387,     1.3.sql
 676584941,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
index c791cef2d..b3dafa3f2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/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 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 description2 blob(64M);
 alter table migtest_e_basic add column old_boolean smallint default 0 default false not null;
 alter table migtest_e_basic add column old_boolean2 smallint default 0;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
index 30c6b2b8e..4e1016ce9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
@@ -1,7 +1,7 @@
 1959738162,     1.0__initial.sql
 -1594597621,    1.1.sql
 1791049503,     1.2__dropsFor_1.1.sql
-99025497,       1.3.sql
+-1860778446,    1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
index ab2148795..06f323238 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/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_mgtst__bsc_sr_d;
 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 description2 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/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
index e50c9477c..f8b41e5fc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
@@ -1,7 +1,7 @@
 254148970,      1.0__initial.sql
 -1126979163,    1.1.sql
 1791049503,     1.2__dropsFor_1.1.sql
--183167227,     1.3.sql
+-191324018,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
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 e6dd4b34a..e5cf08d5a 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
@@ -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 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 description2 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 c4559ee6f..5a92d457a 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,7 +1,7 @@
 662450113,      1.0__initial.sql
 1615151513,     1.1.sql
 1791049503,     1.2__dropsFor_1.1.sql
--1206650320,    1.3.sql
+1024337021,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
index e6dd4b34a..e5cf08d5a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/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 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 description2 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/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
index c4559ee6f..5a92d457a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
@@ -1,7 +1,7 @@
 662450113,      1.0__initial.sql
 1615151513,     1.1.sql
 1791049503,     1.2__dropsFor_1.1.sql
--1206650320,    1.3.sql
+1024337021,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
index 8e3122e17..13b1f7901 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/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 description2 varchar(127);
 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/generic/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
index f487f916b..835412d75 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
@@ -1,6 +1,6 @@
 -1383651907,    1.0__initial.sql
 -1825206641,    1.1.sql
 519662611,      1.2__dropsFor_1.1.sql
-297569863,      1.3.sql
+-694156372,     1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 
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..f4e5cdbf7 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 description2 varchar(227);
 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..91caca6ba 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
 1409369419,     1.1.sql
 -1904864828,    1.2__dropsFor_1.1.sql
--1513154593,    1.3.sql
+955423690,      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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
index 9e3ba6f9f..f5e4268bb 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 ( description2 nvarchar(127));
 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..d6bdd1488 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
 -1152055114,    1.1.sql
 1569252375,     1.2__dropsFor_1.1.sql
-1566488731,     1.3.sql
+-5080522,       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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
index f7f307719..e2f99c94a 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 description2 varchar(127);
 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..a1067cf9f 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
 -865579750,     1.1.sql
 2029151368,     1.2__dropsFor_1.1.sql
--2039573992,    1.3.sql
+1688061039,     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-noprocs/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
index 5930c283a..32868f369 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/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 description2 varchar(127);
 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-noprocs/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
index 8c71ab965..e15facf52 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
@@ -1,7 +1,7 @@
 629411155,      1.0__initial.sql
 128637084,      1.1.sql
 2029151368,     1.2__dropsFor_1.1.sql
--1957738355,    1.3.sql
+2066375527,     1.3.sql
 89701608,       1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
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..32868f369 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 description2 varchar(127);
 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..db5e5fdde 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
@@ -2,7 +2,7 @@
 629411155,      1.0__initial.sql
 128637084,      1.1.sql
 -1078955818,    1.2__dropsFor_1.1.sql
--1957738355,    1.3.sql
+2066375527,     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.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
index 296b101b0..a45f74384 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="description2" type="db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)"/>
             <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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
index 6953c06f5..4db93c716 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 description2 varchar(127);
 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..6411d3b61 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
@@ -2,7 +2,7 @@
 -625233983,     1.0__initial.sql
 -1627573867,    1.1.sql
 426154419,      1.2__dropsFor_1.1.sql
--380371830,     1.3.sql
+-912122613,     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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
index 6953c06f5..4db93c716 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 description2 varchar(127);
 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 c456088a8..b6eaabb70 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
@@ -2,7 +2,7 @@
 -753661440,     1.0__initial.sql
 -1627573867,    1.1.sql
 426154419,      1.2__dropsFor_1.1.sql
--380371830,     1.3.sql
+-912122613,     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/nuodb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
index 0dac2cb68..dd2cc1316 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/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 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 description2 varchar(127);
 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/nuodb/idx_nuodb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
index c79573427..31a151683 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
@@ -1,7 +1,7 @@
 -1938088728,    1.0__initial.sql
 667708916,      1.1.sql
 1794931214,     1.2__dropsFor_1.1.sql
-870952105,      1.3.sql
+-393070431,     1.3.sql
 473283202,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
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..ed27922b2 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 description2 varchar2(127);
 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..95ddb4adb 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
 -411370666,     1.1.sql
 521762942,      1.2__dropsFor_1.1.sql
-483114276,      1.3.sql
+371950917,      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/oracle11/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
index 0b528fe86..c2f59614c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
@@ -32,6 +32,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 description2 varchar2(127);
 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/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
index 407f8042b..a9520a367 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
@@ -1,7 +1,7 @@
 -135608451,     1.0__initial.sql
 1927010726,     1.1.sql
 521762942,      1.2__dropsFor_1.1.sql
-1543053715,     1.3.sql
+1449510461,     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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
index dbcb50aac..e3a825a2c 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 description2 varchar(127);
 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..7eeb91a48 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
 1548995254,     1.1.sql
 -1155149746,    1.2__dropsFor_1.1.sql
--1798982281,    1.3.sql
+-303061649,     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/postgres9/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
index b6e8c3a34..ff5c60830 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/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 description2 varchar(127);
 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/postgres9/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
index d445fd00e..f23717ef8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
@@ -1,7 +1,7 @@
 -582258071,     1.0__initial.sql
 1253246780,     1.1.sql
 -1155149746,    1.2__dropsFor_1.1.sql
-326342179,      1.3.sql
+22458812,       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/sqlanywhere/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
index 0133a0673..16a6242b9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/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 description2 varchar(127);
 alter table migtest_e_basic add column old_boolean bit default false not null;
 alter table migtest_e_basic add column old_boolean2 bit;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
index c3f962ea2..c95356d8d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
@@ -1,6 +1,6 @@
 1714992528,     1.0__initial.sql
 776493598,      1.1.sql
 519662611,      1.2__dropsFor_1.1.sql
--1656705954,    1.3.sql
+1025160700,     1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 
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..2f08cf01a 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 description2 varchar(127);
 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..ea522c240 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
 -1974335860,    1.1.sql
 519662611,      1.2__dropsFor_1.1.sql
--1764531063,    1.3.sql
+981819594,      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/sqlserver16/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
index 9a143282f..ff6aa310d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
@@ -31,6 +31,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 description2 varchar(227);
 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/sqlserver16/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
index 6c9a7762a..ad8e7e852 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
@@ -2,7 +2,7 @@
 -390904708,     1.0__initial.sql
 -1042228916,    1.1.sql
 1470614292,     1.2__dropsFor_1.1.sql
--807119885,     1.3.sql
+-948255182,     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/sqlserver17/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
index 76564b73c..fc7b9e959 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 description2 nvarchar(227);
 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..bc9ade414 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
@@ -2,7 +2,7 @@
 -1036149520,    1.0__initial.sql
 -898063858,     1.1.sql
 1470614292,     1.2__dropsFor_1.1.sql
--1791137342,    1.3.sql
+790811814,      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.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
index d0e444fc4..754e29b06 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 description2 varchar(127);
 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..e7ccfb6ad 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
 1985413053,     1.1.sql
 -1155149746,    1.2__dropsFor_1.1.sql
-2034977550,     1.3.sql
+-27599186,      1.3.sql
 -1991941691,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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 6/7] 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;
 

From 7ccea9ff7e5cdf51c908c4cf8293781ce6476dcb Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Fri, 18 Feb 2022 10:03:04 +0100
Subject: [PATCH 7/7] migrations

---
 .../migrationtest/dbmigration/clickhouse/1.0__initial.sql   | 2 +-
 .../dbmigration/clickhouse/1.2__dropsFor_1.1.sql            | 2 +-
 .../resources/migrationtest/dbmigration/clickhouse/1.3.sql  | 2 +-
 .../dbmigration/clickhouse/idx_clickhouse.migrations        | 6 +++---
 .../migrationtest/dbmigration/cockroach/1.0__initial.sql    | 2 +-
 .../dbmigration/cockroach/1.2__dropsFor_1.1.sql             | 2 +-
 .../resources/migrationtest/dbmigration/cockroach/1.3.sql   | 2 +-
 .../dbmigration/cockroach/idx_cockroach.migrations          | 6 +++---
 .../migrationtest/dbmigration/db2fori/1.0__initial.sql      | 2 +-
 .../migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql | 2 +-
 .../resources/migrationtest/dbmigration/db2fori/1.3.sql     | 2 +-
 .../migrationtest/dbmigration/db2fori/idx_db2.migrations    | 6 +++---
 .../migrationtest/dbmigration/db2legacy/1.0__initial.sql    | 2 +-
 .../dbmigration/db2legacy/1.2__dropsFor_1.1.sql             | 2 +-
 .../resources/migrationtest/dbmigration/db2legacy/1.3.sql   | 2 +-
 .../migrationtest/dbmigration/db2legacy/idx_db2.migrations  | 6 +++---
 .../migrationtest/dbmigration/db2luw/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/db2luw/1.3.sql | 2 +-
 .../migrationtest/dbmigration/db2luw/idx_db2.migrations     | 6 +++---
 .../migrationtest/dbmigration/db2zos/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/db2zos/1.3.sql | 2 +-
 .../migrationtest/dbmigration/db2zos/idx_db2.migrations     | 6 +++---
 .../migrationtest/dbmigration/generic/1.0__initial.sql      | 2 +-
 .../migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql | 2 +-
 .../resources/migrationtest/dbmigration/generic/1.3.sql     | 2 +-
 .../dbmigration/generic/idx_generic.migrations              | 6 +++---
 .../resources/migrationtest/dbmigration/h2/1.0__initial.sql | 2 +-
 .../migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql      | 2 +-
 .../src/test/resources/migrationtest/dbmigration/h2/1.3.sql | 2 +-
 .../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   | 2 +-
 .../migrationtest/dbmigration/hana/idx_hana.migrations      | 6 +++---
 .../migrationtest/dbmigration/hsqldb/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/hsqldb/1.3.sql | 2 +-
 .../migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations  | 6 +++---
 .../dbmigration/mariadb-noprocs/1.0__initial.sql            | 2 +-
 .../dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql       | 2 +-
 .../migrationtest/dbmigration/mariadb-noprocs/1.3.sql       | 2 +-
 .../dbmigration/mariadb-noprocs/idx_mariadb.migrations      | 6 +++---
 .../migrationtest/dbmigration/mariadb/1.0__initial.sql      | 2 +-
 .../migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql | 2 +-
 .../resources/migrationtest/dbmigration/mariadb/1.3.sql     | 2 +-
 .../dbmigration/mariadb/idx_mariadb.migrations              | 6 +++---
 .../migrationtest/dbmigration/model/1.0__initial.model.xml  | 2 +-
 .../resources/migrationtest/dbmigration/model/1.1.model.xml | 2 +-
 .../dbmigration/model/1.2__dropsFor_1.1.model.xml           | 2 +-
 .../resources/migrationtest/dbmigration/model/1.3.model.xml | 2 +-
 .../migrationtest/dbmigration/mysql/1.0__initial.sql        | 2 +-
 .../migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql   | 2 +-
 .../test/resources/migrationtest/dbmigration/mysql/1.3.sql  | 2 +-
 .../migrationtest/dbmigration/mysql/idx_mysql.migrations    | 6 +++---
 .../migrationtest/dbmigration/mysql55/1.0__initial.sql      | 2 +-
 .../migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql | 2 +-
 .../resources/migrationtest/dbmigration/mysql55/1.3.sql     | 2 +-
 .../migrationtest/dbmigration/mysql55/idx_mysql.migrations  | 6 +++---
 .../migrationtest/dbmigration/nuodb/1.0__initial.sql        | 2 +-
 .../migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql   | 2 +-
 .../test/resources/migrationtest/dbmigration/nuodb/1.3.sql  | 2 +-
 .../migrationtest/dbmigration/nuodb/idx_nuodb.migrations    | 6 +++---
 .../migrationtest/dbmigration/oracle/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/oracle/1.3.sql | 2 +-
 .../migrationtest/dbmigration/oracle/idx_oracle.migrations  | 6 +++---
 .../migrationtest/dbmigration/oracle11/1.0__initial.sql     | 2 +-
 .../dbmigration/oracle11/1.2__dropsFor_1.1.sql              | 2 +-
 .../resources/migrationtest/dbmigration/oracle11/1.3.sql    | 2 +-
 .../dbmigration/oracle11/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    | 2 +-
 .../dbmigration/postgres/idx_postgres.migrations            | 6 +++---
 .../migrationtest/dbmigration/postgres9/1.0__initial.sql    | 2 +-
 .../dbmigration/postgres9/1.2__dropsFor_1.1.sql             | 2 +-
 .../resources/migrationtest/dbmigration/postgres9/1.3.sql   | 2 +-
 .../dbmigration/postgres9/idx_postgres.migrations           | 6 +++---
 .../migrationtest/dbmigration/sqlanywhere/1.0__initial.sql  | 2 +-
 .../dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql           | 2 +-
 .../resources/migrationtest/dbmigration/sqlanywhere/1.3.sql | 2 +-
 .../dbmigration/sqlanywhere/idx_sqlanywhere.migrations      | 6 +++---
 .../migrationtest/dbmigration/sqlite/1.0__initial.sql       | 2 +-
 .../migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql  | 2 +-
 .../test/resources/migrationtest/dbmigration/sqlite/1.3.sql | 2 +-
 .../migrationtest/dbmigration/sqlite/idx_sqlite.migrations  | 6 +++---
 .../migrationtest/dbmigration/sqlserver16/1.0__initial.sql  | 2 +-
 .../dbmigration/sqlserver16/1.2__dropsFor_1.1.sql           | 2 +-
 .../resources/migrationtest/dbmigration/sqlserver16/1.3.sql | 2 +-
 .../dbmigration/sqlserver16/idx_sqlserver.migrations        | 6 +++---
 .../migrationtest/dbmigration/sqlserver17/1.0__initial.sql  | 2 +-
 .../dbmigration/sqlserver17/1.2__dropsFor_1.1.sql           | 2 +-
 .../resources/migrationtest/dbmigration/sqlserver17/1.3.sql | 2 +-
 .../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    | 2 +-
 .../dbmigration/yugabyte/idx_yugabyte.migrations            | 6 +++---
 100 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
index c5eddf5ad..1d41eabbe 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
@@ -51,7 +51,7 @@ create table migtest_e_basic (
   status2                       String default 'N',
   name                          String,
   description                   String,
-  description2                  String,
+  description_file              blob,
   some_date                     DateTime,
   old_boolean                   UInt8 default false,
   old_boolean2                  UInt8,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql
index 6ca9bbadc..bf1e082c9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/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/clickhouse/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
index 8e0ffdef5..88cea0bee 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql
@@ -21,7 +21,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_description;
 update migtest_e_basic set user_id = 23 where user_id is null;
 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 description2 String;
+alter table migtest_e_basic add column description_file blob;
 alter table migtest_e_basic add column old_boolean UInt8 default false;
 alter table migtest_e_basic add column old_boolean2 UInt8;
 alter table migtest_e_basic add column eref_id UInt32;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
index 8d0005bd9..83e4a9ccc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
@@ -1,6 +1,6 @@
--429555051,     1.0__initial.sql
+-697238714,     1.0__initial.sql
 1864520180,     1.1.sql
-519662611,      1.2__dropsFor_1.1.sql
--1108954500,    1.3.sql
+628353409,      1.2__dropsFor_1.1.sql
+-489730240,     1.3.sql
 -1045594368,    1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
index e0719c8a8..c4788bf9a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/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/cockroach/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql
index b50b1071a..43d6a8119 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/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/cockroach/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
index 0b6ce1041..167a362ff 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
@@ -31,7 +31,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 description2 varchar(127);
+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/cockroach/idx_cockroach.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
index e23ea759d..6ccb81618 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
@@ -1,7 +1,7 @@
-1784035212,     1.0__initial.sql
+-1611775717,    1.0__initial.sql
 -1108404951,    1.1.sql
--979513548,     1.2__dropsFor_1.1.sql
--162585387,     1.3.sql
+-835109514,     1.2__dropsFor_1.1.sql
+-30927192,      1.3.sql
 676584941,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
index 4dafd604d..05b097f9e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/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                   smallint default 0 default false not null,
   old_boolean2                  smallint default 0,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql
index 95857c382..6dd324358 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/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/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
index b3dafa3f2..67dc88e93 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
@@ -31,7 +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 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 description2 blob(64M);
+alter table migtest_e_basic add column description_file blob(64M);
 alter table migtest_e_basic add column old_boolean smallint default 0 default false not null;
 alter table migtest_e_basic add column old_boolean2 smallint default 0;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
index 4e1016ce9..4b0730bca 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
@@ -1,7 +1,7 @@
-1959738162,     1.0__initial.sql
+-1545566871,    1.0__initial.sql
 -1594597621,    1.1.sql
-1791049503,     1.2__dropsFor_1.1.sql
--1860778446,    1.3.sql
+-1093742153,    1.2__dropsFor_1.1.sql
+217221833,      1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
index 7c3f05efa..436ede7d6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/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/db2legacy/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql
index 95857c382..6dd324358 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/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/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
index 06f323238..c14e3c85b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
@@ -31,7 +31,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
 alter table migtest_e_basic drop constraint fk_mgtst__bsc_sr_d;
 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 description2 blob(64M);
+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/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
index f8b41e5fc..e9d6d9fb7 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
@@ -1,7 +1,7 @@
-254148970,      1.0__initial.sql
+835032311,      1.0__initial.sql
 -1126979163,    1.1.sql
-1791049503,     1.2__dropsFor_1.1.sql
--191324018,     1.3.sql
+-1093742153,    1.2__dropsFor_1.1.sql
+661912050,      1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
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 4cfd1f6ac..9123e160b 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 95857c382..6dd324358 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 e5cf08d5a..c0d33b5f0 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
@@ -31,7 +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 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 description2 blob(64M);
+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 5a92d457a..08a6b5282 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,7 +1,7 @@
-662450113,      1.0__initial.sql
+-376187636,     1.0__initial.sql
 1615151513,     1.1.sql
-1791049503,     1.2__dropsFor_1.1.sql
-1024337021,     1.3.sql
+-1093742153,    1.2__dropsFor_1.1.sql
+1569705465,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
index 4cfd1f6ac..9123e160b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/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/db2zos/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql
index 95857c382..6dd324358 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/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/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
index e5cf08d5a..c0d33b5f0 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
@@ -31,7 +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 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 description2 blob(64M);
+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/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
index 5a92d457a..08a6b5282 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
@@ -1,7 +1,7 @@
-662450113,      1.0__initial.sql
+-376187636,     1.0__initial.sql
 1615151513,     1.1.sql
-1791049503,     1.2__dropsFor_1.1.sql
-1024337021,     1.3.sql
+-1093742153,    1.2__dropsFor_1.1.sql
+1569705465,     1.3.sql
 441227910,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
index abf2a9c91..988f55d66 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/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/generic/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql
index 6ca9bbadc..bf1e082c9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/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/generic/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
index 13b1f7901..583276331 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
@@ -31,7 +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 description2 varchar(127);
+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/generic/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
index 835412d75..1e82b78f3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
@@ -1,6 +1,6 @@
--1383651907,    1.0__initial.sql
+-2041271676,    1.0__initial.sql
 -1825206641,    1.1.sql
-519662611,      1.2__dropsFor_1.1.sql
--694156372,     1.3.sql
+628353409,      1.2__dropsFor_1.1.sql
+-1404280556,    1.3.sql
 -1045594368,    1.4__dropsFor_1.3.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 f4e5cdbf7..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,7 +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 description2 varchar(227);
+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 91caca6ba..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
-955423690,      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 f5e4268bb..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,7 +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 ( description2 nvarchar(127));
+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 d6bdd1488..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
--5080522,       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 e2f99c94a..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,7 +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 description2 varchar(127);
+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 a1067cf9f..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
-1688061039,     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-noprocs/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
index 1d2a9a5b8..ea67bcb04 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/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-noprocs/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql
index bfe2be7bb..f38f547e1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/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/mariadb-noprocs/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
index 32868f369..c3f1dd68f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
@@ -26,7 +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 description2 varchar(127);
+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-noprocs/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
index e15facf52..a66b70c10 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
@@ -1,7 +1,7 @@
-629411155,      1.0__initial.sql
+-616900688,     1.0__initial.sql
 128637084,      1.1.sql
-2029151368,     1.2__dropsFor_1.1.sql
-2066375527,     1.3.sql
+-2077736415,    1.2__dropsFor_1.1.sql
+-1744111309,    1.3.sql
 89701608,       1.4__dropsFor_1.3.sql
 561281075,      R__order_views.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 32868f369..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,7 +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 description2 varchar(127);
+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 db5e5fdde..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
-2066375527,     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 3b9f431c8..69b8c6851 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 a87d01c57..0edbb49da 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
@@ -110,7 +110,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 a45f74384..a8189b797 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,7 +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="description2" type="db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)"/>
+            <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 4db93c716..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,7 +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 description2 varchar(127);
+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 6411d3b61..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
--912122613,     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 3e6410977..68f5324da 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
-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/mysql55/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
index 4db93c716..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,7 +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 description2 varchar(127);
+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 b6eaabb70..5994ca140 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,8 +1,8 @@
 1835064798,     I__create_procs.sql
--753661440,     1.0__initial.sql
+881444156,      1.0__initial.sql
 -1627573867,    1.1.sql
-426154419,      1.2__dropsFor_1.1.sql
--912122613,     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/nuodb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
index 52477bd2d..598ba6f2d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/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/nuodb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql
index c33aa5fc1..392d707e3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/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/nuodb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
index dd2cc1316..fa3e3b33d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
@@ -36,7 +36,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 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 description2 varchar(127);
+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/nuodb/idx_nuodb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
index 31a151683..f019b05ef 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
@@ -1,7 +1,7 @@
--1938088728,    1.0__initial.sql
+-1343627271,    1.0__initial.sql
 667708916,      1.1.sql
-1794931214,     1.2__dropsFor_1.1.sql
--393070431,     1.3.sql
+-430421425,     1.2__dropsFor_1.1.sql
+360040564,      1.3.sql
 473283202,      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 ed27922b2..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,7 +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 description2 varchar2(127);
+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 95ddb4adb..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
-371950917,      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/oracle11/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
index 89dacfbe7..2178953b6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
@@ -68,7 +68,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/oracle11/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql
index 68847f4cc..ee9cc6325 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/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/oracle11/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
index c2f59614c..a40a2bece 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
@@ -32,7 +32,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 description2 varchar2(127);
+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/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
index a9520a367..fc08855e1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
@@ -1,7 +1,7 @@
--135608451,     1.0__initial.sql
+-756544611,     1.0__initial.sql
 1927010726,     1.1.sql
-521762942,      1.2__dropsFor_1.1.sql
-1449510461,     1.3.sql
+-1698942539,    1.2__dropsFor_1.1.sql
+1883580424,     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 e3a825a2c..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,7 +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 description2 varchar(127);
+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 7eeb91a48..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
--303061649,     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/postgres9/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
index cd0cf0f7d..259f541c4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/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/postgres9/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql
index c98a15504..35a7e2b4a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/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/postgres9/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
index ff5c60830..86910344d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
@@ -36,7 +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 description2 varchar(127);
+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/postgres9/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
index f23717ef8..334503fd9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
@@ -1,7 +1,7 @@
--582258071,     1.0__initial.sql
+36350976,       1.0__initial.sql
 1253246780,     1.1.sql
--1155149746,    1.2__dropsFor_1.1.sql
-22458812,       1.3.sql
+1360771849,     1.2__dropsFor_1.1.sql
+-1114998431,    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/sqlanywhere/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
index ef262f2a9..65f593fc0 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/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              binary(4500),
   some_date                     timestamp,
   old_boolean                   bit default false not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql
index 6ca9bbadc..bf1e082c9 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/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/sqlanywhere/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
index 16a6242b9..b8349412b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
@@ -31,7 +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 description2 varchar(127);
+alter table migtest_e_basic add column description_file binary(4500);
 alter table migtest_e_basic add column old_boolean bit default false not null;
 alter table migtest_e_basic add column old_boolean2 bit;
 alter table migtest_e_basic add column eref_id integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
index c95356d8d..8ad7c45a6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
@@ -1,6 +1,6 @@
-1714992528,     1.0__initial.sql
+-1152950940,    1.0__initial.sql
 776493598,      1.1.sql
-519662611,      1.2__dropsFor_1.1.sql
-1025160700,     1.3.sql
+628353409,      1.2__dropsFor_1.1.sql
+436164575,      1.3.sql
 -1045594368,    1.4__dropsFor_1.3.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 2f08cf01a..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,7 +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 description2 varchar(127);
+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 ea522c240..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
-981819594,      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/sqlserver16/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
index 33a9e7032..2058f54b6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/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              image,
   some_date                     datetime2,
   old_boolean                   bit default 0 not null,
   old_boolean2                  bit,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql
index e88590502..a49969d1e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/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/sqlserver16/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
index ff6aa310d..004107385 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
@@ -31,7 +31,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 description2 varchar(227);
+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/sqlserver16/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
index ad8e7e852..a147ed2f5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
@@ -1,8 +1,8 @@
 -2122378240,    I__create_procs.sql
--390904708,     1.0__initial.sql
+1983037247,     1.0__initial.sql
 -1042228916,    1.1.sql
-1470614292,     1.2__dropsFor_1.1.sql
--948255182,     1.3.sql
+1019731053,     1.2__dropsFor_1.1.sql
+-897790738,     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/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 fc7b9e959..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,7 +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 description2 nvarchar(227);
+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 bc9ade414..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
-790811814,      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 754e29b06..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,7 +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 description2 varchar(127);
+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 e7ccfb6ad..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
--27599186,      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