* Using this for now instead of String.intern() to avoid any unexpected * increase in PermGen space. - *
*/ public final class InternString { private static final HashMap* Primarily for supporting Embedded beans with overridden dbColumn * mappings. - *
*/ public BeanProperty(BeanProperty source, BeanPropertyOverride override) { - this.descriptor = source.descriptor; this.propertyIndex = source.propertyIndex; this.name = source.getName(); - this.dbColumn = InternString.intern(override.getDbColumn()); + this.dbColumn = override.getDbColumn(); this.nullable = override.isDbNullable(); + this.dbLength = override.getDbLength(); + this.dbScale = override.getDbScale(); + this.dbColumnDefn = InternString.intern(override.getDbColumnDefn()); // override with sqlFormula not currently supported this.sqlFormulaJoin = null; this.sqlFormulaSelect = null; this.formula = false; this.aggregation = null; - this.excludedFromHistory = source.excludedFromHistory; this.tenantId = source.tenantId; this.draft = source.draft; @@ -409,7 +401,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.secondaryTable = source.isSecondaryTable(); this.secondaryTableJoin = source.secondaryTableJoin; this.secondaryTableJoinPrefix = source.secondaryTableJoinPrefix; - this.dbComment = source.dbComment; this.dbBind = source.getDbBind(); this.dbEncrypted = source.isDbEncrypted(); @@ -420,16 +411,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.dbUpdatable = source.isDbUpdatable(); this.unique = source.isUnique(); this.naturalKey = source.isNaturalKey(); - this.dbLength = source.getDbLength(); - this.dbScale = source.getDbScale(); - this.dbColumnDefn = InternString.intern(source.getDbColumnDefn()); this.dbColumnDefault = source.dbColumnDefault; this.dbMigrationInfos = source.dbMigrationInfos; - this.inherited = source.isInherited(); this.owningType = source.owningType; this.local = owningType.equals(descriptor.getBeanType()); - this.version = source.isVersion(); this.embedded = source.isEmbedded(); this.id = source.isId(); @@ -443,11 +429,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { this.field = source.getField(); this.docOptions = source.docOptions; this.unmappedJson = source.unmappedJson; - this.elPrefix = override.replace(source.elPrefix, source.dbColumn); this.elPlaceHolder = override.replace(source.elPlaceHolder, source.dbColumn); this.elPlaceHolderEncrypted = override.replace(source.elPlaceHolderEncrypted, source.dbColumn); - this.jsonSerialize = source.jsonSerialize; this.jsonDeserialize = source.jsonDeserialize; } @@ -562,9 +546,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { if (formula && sqlFormulaJoin != null) { ctx.appendFormulaJoin(sqlFormulaJoin, joinType); - } else if (secondaryTableJoin != null) { - String relativePrefix = ctx.getRelativePrefix(secondaryTableJoinPrefix); secondaryTableJoin.addJoin(joinType, relativePrefix, ctx); } @@ -585,7 +567,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { @Override public void appendSelect(DbSqlContext ctx, boolean subQuery) { - if (aggregation != null) { ctx.appendFormulaSelect(aggregation); } else if (formula) { @@ -596,15 +577,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { if (secondaryTableJoin != null) { ctx.pushTableAlias(ctx.getRelativePrefix(secondaryTableJoinPrefix)); } - if (dbEncrypted) { ctx.appendRawColumn(getDecryptSqlWithColumnAlias(ctx.peekTableAlias())); ctx.addEncryptedProp(this); - } else { ctx.appendColumn(dbColumn); } - if (secondaryTableJoin != null) { ctx.popTableAlias(); } @@ -661,7 +639,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException { - try { Object value = scalarType.read(ctx.getDataReader()); if (bean != null) { @@ -715,7 +692,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Copy/set the property value from the draft bean to the live bean. */ public void publish(EntityBean draftBean, EntityBean liveBean) { - if (!version && !draftOnly) { // set property value from draft to live Object value = getValueIntercept(draftBean); @@ -898,7 +874,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { @Override public void pathSet(Object bean, Object value) { - if (bean != null) { Object logicalVal = convertToLogicalType(value); setValueIntercept((EntityBean) bean, logicalVal); @@ -1073,14 +1048,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Return the DB scale for numeric columns. */ - private int getDbScale() { + public int getDbScale() { return dbScale; } /** * Return a specific column DDL definition if specified (otherwise null). */ - private String getDbColumnDefn() { + public String getDbColumnDefn() { return dbColumnDefn; } @@ -1278,7 +1253,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { case Types.LONGVARCHAR: case Types.LONGVARBINARY: return true; - default: return false; } @@ -1499,7 +1473,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } public void jsonRead(SpiJsonReader ctx, EntityBean bean) throws IOException { - JsonToken event = ctx.nextToken(); if (JsonToken.VALUE_NULL == event) { if (jsonDeserialize) { @@ -1550,7 +1523,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Add to the document mapping if this property is included for this index. */ public void docStoreMapping(DocMappingBuilder mapping, String prefix) { - if (mapping.includesProperty(prefix, name)) { DocPropertyType type = scalarType.getDocType(); DocPropertyOptions options = docOptions.copy(); @@ -1570,7 +1542,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } public void registerColumn(BeanDescriptor desc, String prefix) { - String path = SplitName.add(prefix, name); if (formula && dbColumn != null) { // trim off table alias placeholder if found diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java index 43b0955a9..b0a521388 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java @@ -13,10 +13,16 @@ class BeanPropertyOverride { private final String dbColumn; private final boolean dbNullable; + private final int dbLength; + private final int dbScale; + private final String dbColumnDefn; - BeanPropertyOverride(String dbColumn, boolean dbNullable) { + BeanPropertyOverride(String dbColumn, boolean dbNullable, int dbLength, int dbScale, String dbColumnDefn) { this.dbColumn = InternString.intern(dbColumn); this.dbNullable = dbNullable; + this.dbLength = dbLength; + this.dbScale = dbScale; + this.dbColumnDefn = dbColumnDefn; } String getDbColumn() { @@ -27,6 +33,18 @@ class BeanPropertyOverride { return dbNullable; } + int getDbLength() { + return dbLength; + } + + int getDbScale() { + return dbScale; + } + + String getDbColumnDefn() { + return dbColumnDefn; + } + String replace(String src, String srcDbColumn) { return StringHelper.replaceString(src, srcDbColumn, dbColumn); } diff --git a/src/test/ddl-review/h2-create-all.sql b/src/test/ddl-review/h2-create-all.sql index a9cb06e29..c0a944050 100644 --- a/src/test/ddl-review/h2-create-all.sql +++ b/src/test/ddl-review/h2-create-all.sql @@ -1,4 +1,4 @@ --- Generated by ebean unknown at 2020-08-24T21:11:54.586122Z +-- Generated by ebean unknown at 2020-08-24T21:46:04.720412Z create table asimple_bean ( id bigint generated by default as identity not null, name varchar(255), @@ -1434,8 +1434,8 @@ create table eperson2 ( id bigint generated by default as identity not null, name varchar(255), notes varchar(255), - street varchar(255), - suburb varchar(255), + street varchar(10), + suburb varchar(100), city varchar(255) not null, status varchar(3) not null, version bigint not null, diff --git a/src/test/java/org/tests/model/embedded/EPerson2.java b/src/test/java/org/tests/model/embedded/EPerson2.java index d955c9864..e4c11d935 100644 --- a/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/src/test/java/org/tests/model/embedded/EPerson2.java @@ -24,7 +24,9 @@ public class EPerson2 { @Embedded @AttributeOverrides({ @AttributeOverride(name = "city", column = @Column(nullable = false)), - @AttributeOverride(name = "status", column = @Column(nullable = false)) + @AttributeOverride(name = "status", column = @Column(nullable = false)), + @AttributeOverride(name = "suburb", column = @Column(length = 100)), + @AttributeOverride(name = "street", column = @Column(columnDefinition = "varchar(10)")) }) EAddress address;