From e3980a14a2d7fe441c433d24361e7180e88f4698 Mon Sep 17 00:00:00 2001 From: Noemi Szemenyei Date: Thu, 17 Feb 2022 09:52:23 +0100 Subject: [PATCH] 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;