From dad4837b50f2701f4c2ac97e35e2826faa176472 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 22 Feb 2022 13:15:28 +1300 Subject: [PATCH] No change - format code only --- .../server/deploy/BeanProperty.java | 24 +++++++++---------- .../ddlgeneration/platform/PlatformDdl.java | 8 +------ 2 files changed, 13 insertions(+), 19 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 e83804be1..27327f1b9 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,7 +992,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ public String renderDbType(DbPlatformType dbType, boolean strict) { if (dbColumnDefn != null) { - if(dbColumnDefn.endsWith(";")) { + if (dbColumnDefn.endsWith(";")) { return dbColumnDefn + dbType.renderType(dbLength, dbScale, strict); } return dbColumnDefn; @@ -1163,26 +1163,26 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { public boolean isLob() { return lob; } - + /** - * Returns true if this isLob() or the type will effectively map to a lob. + * Returns true if this isLob() or the type will effectively map to a lob. */ public boolean isDbLob() { if (lob) { return true; } switch (dbType) { - case DbPlatformType.JSON: - case DbPlatformType.JSONB: - return dbLength == 0; // must be analog to DbPlatformTypeMapping.lookup - case DbPlatformType.JSONBlob: - case DbPlatformType.JSONClob: - return true; - default: - return false; + case DbPlatformType.JSON: + case DbPlatformType.JSONB: + return dbLength == 0; // must be analog to DbPlatformTypeMapping.lookup + case DbPlatformType.JSONBlob: + case DbPlatformType.JSONClob: + return true; + default: + return false; } } - + public static boolean isLobType(int type) { switch (type) { case Types.CLOB: 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 d9030a07b..67a11d1e6 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 @@ -9,11 +9,7 @@ import io.ebean.config.dbplatform.DbDefaultValue; import io.ebean.config.dbplatform.DbIdentity; import io.ebean.config.dbplatform.IdType; import io.ebean.util.StringHelper; -import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler; -import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer; -import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler; -import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions; -import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; +import io.ebeaninternal.dbmigration.ddlgeneration.*; import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter; import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.VowelRemover; import io.ebeaninternal.dbmigration.migration.AddHistoryTable; @@ -319,9 +315,7 @@ public class PlatformDdl { if (type == null) { return null; } - type = extract(type); - if (type.contains("[]")) { return convertArrayType(type); }