diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java index b0dbe8f80..16e694910 100644 --- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java +++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java @@ -1124,4 +1124,11 @@ public final class EntityBeanIntercept implements Serializable { } return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue); } + + /** + * Explicitly set an old value. + */ + public void setOldValue(int propertyIndex,Object oldValue) { + setChangedPropertyValue(propertyIndex, true, oldValue); + } } diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index ea1fddc07..ca35cfb54 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -18,6 +18,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanManager; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.persist.BatchedSqlException; @@ -179,6 +180,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP beanDescriptor.setDraftDirty(entityBean, true); } this.dirty = intercept.isDirty(); + initGeneratedProperties(); } /** @@ -225,6 +227,52 @@ public final class PersistRequestBean extends PersistRequest implements BeanP persistCascade = transaction.isPersistCascade(); } + private void initGeneratedProperties() { + switch (type) { + case INSERT: + onInsertGeneratedProperties(); + break; + case UPDATE: + if (!beanDescriptor.isReference(intercept) && (dirty || statelessUpdate)) { + onUpdateGeneratedProperties(); + } + break; + case SOFT_DELETE: + onUpdateGeneratedProperties(); + break; + } + } + + private void onUpdateGeneratedProperties() { + + for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) { + + GeneratedProperty generatedProperty = prop.getGeneratedProperty(); + if (prop.isVersion()) { + if (isLoadedProperty(prop)) { + // @Version property must be loaded to be involved + Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); + Object oldVal = prop.getValue(entityBean); + setVersionValue(value); + intercept.setOldValue(prop.getPropertyIndex(), oldVal); + } + } else { + // @WhenModified set without invoking interception + Object oldVal = prop.getValue(entityBean); + Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); + prop.setValueChanged(entityBean, value); + intercept.setOldValue(prop.getPropertyIndex(), oldVal); + } + } + } + + private void onInsertGeneratedProperties() { + for (BeanProperty prop : beanDescriptor.propertiesGenInsert()) { + Object value = prop.getGeneratedProperty().getInsertValue(prop, entityBean, now()); + prop.setValueChanged(entityBean, value); + } + } + /** * If using batch on cascade flush if required. */ @@ -525,7 +573,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Prepare the update after potential modifications in a BeanPersistController. */ private void postControllerPrepareUpdate() { - if (intercept.isNew() && controller != null) { + if (statelessUpdate && controller != null) { // 'stateless update' - set dirty properties modified in controller preUpdate intercept.setNewBeanForUpdate(); } @@ -857,27 +905,6 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } } - /** - * Determine the concurrency mode depending on fully/partially populated bean. - *

- * Specifically with version concurrency we want to check that the version property was one of the - * loaded properties. - *

- */ - public ConcurrencyMode determineConcurrencyMode() { - - // 'partial bean' update/delete... - if (concurrencyMode.equals(ConcurrencyMode.VERSION)) { - // check the version property was loaded - BeanProperty prop = beanDescriptor.getVersionProperty(); - if (prop == null || !intercept.isLoadedProperty(prop.getPropertyIndex())) { - concurrencyMode = ConcurrencyMode.NONE; - } - } - - return concurrencyMode; - } - /** * Return true if the update DML/SQL must be dynamically generated. *

diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index a154a714c..e23d17f45 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -83,6 +83,7 @@ import org.slf4j.LoggerFactory; import javax.persistence.PersistenceException; import java.io.IOException; +import java.io.StringWriter; import java.lang.reflect.Modifier; import java.sql.SQLException; import java.sql.Types; @@ -340,6 +341,8 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { */ private final BeanProperty[] propertiesNonTransient; protected final BeanProperty[] propertiesIndex; + private final BeanProperty[] propertiesGenInsert; + private final BeanProperty[] propertiesGenUpdate; /** * The bean class name or the table name for MapBeans. @@ -478,6 +481,8 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { this.propertiesManySave = listHelper.getManySave(); this.propertiesManyDelete = listHelper.getManyDelete(); this.propertiesManyToMany = listHelper.getManyToMany(); + this.propertiesGenInsert = listHelper.getGeneratedInsert(); + this.propertiesGenUpdate = listHelper.getGeneratedUpdate(); this.derivedTableJoins = listHelper.getTableJoin(); @@ -797,6 +802,10 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return ebeanServer.getReadAuditPrepare(); } + public boolean isChangeLog() { + return changeLogFilter != null; + } + /** * Return true if this request should be included in the change log. */ @@ -806,7 +815,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return null; } PersistRequest.Type type = request.getType(); - switch (type) { + switch (request.getType()) { case INSERT: return changeLogFilter.includeInsert(request) ? insertBeanChange(request) : null; case UPDATE: @@ -815,7 +824,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { case DELETE: return changeLogFilter.includeDelete(request) ? deleteBeanChange(request) : null; default: - throw new IllegalStateException("Unhandled request type " + type); + throw new IllegalStateException("Unhandled request type " + request.getType()); } } @@ -2029,8 +2038,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { } public ElComparator getElComparator(String propNameOrSortBy) { - ElComparator c = comparatorCache.computeIfAbsent(propNameOrSortBy, this::createComparator); - return c; + return comparatorCache.computeIfAbsent(propNameOrSortBy, this::createComparator); } /** @@ -3049,6 +3057,20 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return propertiesLocal; } + /** + * Return the properties set as generated values on insert. + */ + public BeanProperty[] propertiesGenInsert() { + return propertiesGenInsert; + } + + /** + * Return the properties set as generated values on update. + */ + public BeanProperty[] propertiesGenUpdate() { + return propertiesGenUpdate; + } + public void jsonWriteDirty(WriteJson writeJson, EntityBean bean, boolean[] dirtyProps) throws IOException { jsonHelp.jsonWriteDirty(writeJson, bean, dirtyProps); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index 6623475f7..34381da34 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -9,6 +9,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection; import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.type.ScalarTypeString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -345,6 +346,36 @@ public class DeployBeanPropertyLists { return tenant; } + /** + * Return the properties set via generated values on insert. + */ + public BeanProperty[] getGeneratedInsert() { + + List list = new ArrayList<>(); + for (BeanProperty prop : nonTransients) { + GeneratedProperty gen = prop.getGeneratedProperty(); + if (gen != null && gen.includeInInsert()) { + list.add(prop); + } + } + return list.toArray(new BeanProperty[list.size()]); + } + + /** + * Return the properties set via generated values on update. + */ + public BeanProperty[] getGeneratedUpdate() { + + List list = new ArrayList<>(); + for (BeanProperty prop : nonTransients) { + GeneratedProperty gen = prop.getGeneratedProperty(); + if (gen != null && gen.includeInUpdate()) { + list.add(prop); + } + } + return list.toArray(new BeanProperty[list.size()]); + } + /** * Mode used to determine which BeanPropertyAssoc to include. */ diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index 63f1a0d09..ff4741549 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -92,7 +92,7 @@ public final class DeleteMeta { } boolean publish = request.isPublish(); - switch (request.determineConcurrencyMode()) { + switch (request.getConcurrencyMode()) { case NONE: return publish ? sqlNone : sqlDraftNone; @@ -100,7 +100,7 @@ public final class DeleteMeta { return publish ? sqlVersion : sqlDraftVersion; default: - throw new RuntimeException("Invalid mode " + request.determineConcurrencyMode()); + throw new RuntimeException("Invalid mode " + request.getConcurrencyMode()); } } diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java index 672a70db5..9ab432141 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java @@ -77,7 +77,7 @@ public class MetaFactory { DeleteMeta createDelete(BeanDescriptor desc) { BindableId id = idFact.createId(desc); - Bindable version = versionFact.create(desc); + Bindable version = versionFact.createForDelete(desc); Bindable tenantId = versionFact.createTenantId(desc); return new DeleteMeta(emptyStringAsNull, desc, id, version, tenantId); diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java index f86d969e3..6327aabfb 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -93,9 +93,7 @@ public final class UpdateMeta { return getDynamicUpdatePlan(request); } - // 'full bean' update... - ConcurrencyMode mode = request.determineConcurrencyMode(); - switch (mode) { + switch (request.getConcurrencyMode()) { case NONE: return modeNoneUpdatePlan; @@ -103,7 +101,7 @@ public final class UpdateMeta { return modeVersionUpdatePlan; default: - throw new RuntimeException("Invalid mode " + mode); + throw new RuntimeException("Invalid mode " + request.getConcurrencyMode()); } } @@ -125,7 +123,7 @@ public final class UpdateMeta { set.addToUpdate(persistRequest, list); BindableList bindableList = new BindableList(list); - ConcurrencyMode mode = persistRequest.determineConcurrencyMode(); + ConcurrencyMode mode = persistRequest.getConcurrencyMode(); // build the SQL for this update statement String sql = genSql(mode, bindableList, persistRequest.getUpdateTable()); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java deleted file mode 100644 index f084b7998..000000000 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.ebeaninternal.server.persist.dmlbind; - -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.core.PersistRequestBean; -import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; - -import java.sql.SQLException; -import java.util.List; - -/** - * Bindable for generated ManyToOne - likely 'who created'. - */ -class BindableAssocOneGeneratedInsert extends BindableAssocOne { - - private final GeneratedProperty generatedProperty; - - BindableAssocOneGeneratedInsert(BeanPropertyAssocOne assocOne) { - super(assocOne); - this.generatedProperty = assocOne.getGeneratedProperty(); - } - - @Override - public void addToUpdate(PersistRequestBean request, List list) { - throw new RuntimeException("never called"); - } - - @Override - public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { - - Object objectValue = generatedProperty.getInsertValue(assocOne, bean, request.now()); - EntityBean generatedValue = castToEntityBean(objectValue); - assocOne.setValue(bean, generatedValue); - registerDeferred(request, bean, generatedValue); - } - -} diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java deleted file mode 100644 index 302c806c8..000000000 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.ebeaninternal.server.persist.dmlbind; - -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.core.PersistRequestBean; -import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; - -import java.sql.SQLException; -import java.util.List; - -/** - * Bindable for generated ManyToOne - likely 'who modified'. - */ -class BindableAssocOneGeneratedUpdate extends BindableAssocOne { - - private final GeneratedProperty generatedProperty; - - BindableAssocOneGeneratedUpdate(BeanPropertyAssocOne assocOne) { - super(assocOne); - this.generatedProperty = assocOne.getGeneratedProperty(); - } - - @Override - public void addToUpdate(PersistRequestBean request, List list) { - if (generatedProperty.includeInAllUpdates() || request.isAddToUpdate(assocOne)) { - list.add(this); - } - } - - @Override - public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { - - Object objectValue = generatedProperty.getUpdateValue(assocOne, bean, request.now()); - EntityBean generatedValue = castToEntityBean(objectValue); - assocOne.setValueChanged(bean, generatedValue); - registerDeferred(request, bean, generatedValue); - } - -} diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java deleted file mode 100644 index 3719b58e0..000000000 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.ebeaninternal.server.persist.dmlbind; - -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; - -import java.sql.SQLException; - -/** - * Bindable for insert on a property with a GeneratedProperty. - *

- * This is typically a 'insert timestamp', 'update timestamp' or 'counter'. - *

- */ -public class BindablePropertyInsertGenerated extends BindableProperty { - - private final GeneratedProperty gen; - - public BindablePropertyInsertGenerated(BeanProperty prop, GeneratedProperty gen) { - super(prop); - this.gen = gen; - } - - @Override - public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { - - Object value = gen.getInsertValue(prop, bean, request.now()); - - // generated value should be the correct type - if (bean != null) { - // support PropertyChangeSupport - //prop.setValueIntercept(bean, value); - prop.setValue(bean, value); - } - request.bind(value, prop); - } - - /** - * Always bind on Insert SET. - */ - @Override - public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); - } - -} diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java deleted file mode 100644 index 01d798cd3..000000000 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeaninternal.server.persist.dmlbind; - -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.core.PersistRequestBean; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; - -import java.sql.SQLException; -import java.util.List; - -/** - * Bindable for update on a property with a GeneratedProperty. - *

- * This is typically a 'update timestamp' or 'counter'. - *

- */ -public class BindablePropertyUpdateGenerated extends BindableProperty { - - private final GeneratedProperty gen; - - public BindablePropertyUpdateGenerated(BeanProperty prop, GeneratedProperty gen) { - super(prop); - this.gen = gen; - } - - /** - * Add BindablePropertyUpdateGenerated if the property is loaded. - */ - @Override - public void addToUpdate(PersistRequestBean request, List list) { - if (gen.includeInAllUpdates() || request.isLoadedProperty(prop)) { - list.add(this); - } - } - - @Override - public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { - - Object value = gen.getUpdateValue(prop, bean, request.now()); - - // generated value should be the correct type - request.bind(value, prop); - - if (prop.isVersion()) { - if (request.getPersistRequest().isLoadedProperty(prop)) { - // set to the bean after the where clause has been generated - request.registerGeneratedVersion(value); - } - } else { - // @WhenModified set without invoking interception - prop.setValueChanged(bean, value); - } - } - - /** - * Always bind on Insert SET. - */ - @Override - public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); - } - -} diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java new file mode 100644 index 000000000..3d7fe1507 --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java @@ -0,0 +1,54 @@ +package io.ebeaninternal.server.persist.dmlbind; + +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; + +import java.sql.SQLException; +import java.util.List; + +/** + * Bindable for a Version BeanProperty. Obtains value from 'old values'. + */ +public class BindablePropertyVersion implements Bindable { + + protected final BeanProperty prop; + + public BindablePropertyVersion(BeanProperty prop) { + this.prop = prop; + } + + @Override + public String toString() { + return prop.toString(); + } + + @Override + public boolean isDraftOnly() { + return prop.isDraftOnly(); + } + + @Override + public void addToUpdate(PersistRequestBean request, List list) { + if (request.isAddToUpdate(prop)) { + list.add(this); + } + } + + @Override + public void dmlAppend(GenerateDmlRequest request) { + request.appendColumn(prop.getDbColumn()); + } + + /** + * Normal binding of a property value from the bean. + */ + @Override + public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { + + // get prior version value from 'old values' + Object value = bean._ebean_getIntercept().getOrigValue(prop.getPropertyIndex()); + request.bind(value, prop); + } +} diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java index fa4153526..78b0c558d 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java @@ -35,24 +35,7 @@ public class FactoryAssocOnes { } break; } - if (one.getGeneratedProperty() == null) { - list.add(new BindableAssocOne(one)); - } else { - // typically generated 'who' created/modified properties - switch (mode) { - case INSERT: - if (one.getGeneratedProperty().includeInInsert()) { - list.add(new BindableAssocOneGeneratedInsert(one)); - } - break; - case UPDATE: - if (one.getGeneratedProperty().includeInUpdate()) { - // A 'Who Created property' is never updated - list.add(new BindableAssocOneGeneratedUpdate(one)); - } - break; - } - } + list.add(new BindableAssocOne(one)); } } } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java index d223ec7ba..dd1b8093d 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java @@ -40,26 +40,6 @@ public class FactoryProperty { } } - GeneratedProperty gen = prop.getGeneratedProperty(); - if (gen != null) { - if (DmlMode.INSERT.equals(mode)) { - if (gen.includeInInsert()) { - return new BindablePropertyInsertGenerated(prop, gen); - } else { - return null; - } - - } - if (DmlMode.UPDATE.equals(mode)) { - if (gen.includeInUpdate()) { - return new BindablePropertyUpdateGenerated(prop, gen); - } else { - // An 'Insert Timestamp' is never updated - return null; - } - } - } - return prop.isDbEncrypted() ? new BindableEncryptedProperty(prop, bindEncryptDataFirst) : new BindableProperty(prop); } } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java index 374204dfa..e52484d81 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java @@ -17,6 +17,15 @@ public class FactoryVersion { */ public Bindable create(BeanDescriptor desc) { + BeanProperty versionProperty = desc.getVersionProperty(); + return (versionProperty == null) ? null : new BindablePropertyVersion(versionProperty); + } + + /** + * Create a Bindable for the version property(s) for a bean type. + */ + public Bindable createForDelete(BeanDescriptor desc) { + BeanProperty versionProperty = desc.getVersionProperty(); return (versionProperty == null) ? null : new BindableProperty(versionProperty); } diff --git a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java index 95fda1082..2e200abd1 100644 --- a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java +++ b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.persist; +import io.ebean.BaseTestCase; import io.ebeaninternal.api.TDSpiEbeanServer; import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; @@ -7,11 +8,12 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanManager; import org.tests.model.basic.Customer; import org.junit.Test; -import org.mockito.Mockito; + +import java.sql.Timestamp; import static org.junit.Assert.assertEquals; -public class BatchedBeanHolderTest { +public class BatchedBeanHolderTest extends BaseTestCase { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test @@ -20,13 +22,16 @@ public class BatchedBeanHolderTest { TDSpiEbeanServer server = new TDSpiEbeanServer("foo"); - BeanDescriptor beanDescriptor = Mockito.mock(BeanDescriptor.class); + BeanDescriptor beanDescriptor = getBeanDescriptor(Customer.class); + + //BeanDescriptor beanDescriptor = Mockito.mock(BeanDescriptor.class); BeanManager beanManager = new BeanManager(beanDescriptor, null); BatchedBeanHolder holder = new BatchedBeanHolder(null, beanDescriptor, 1); Customer customer = new Customer(); + customer.setUpdtime(new Timestamp(System.currentTimeMillis())); PersistRequestBean req1 = new PersistRequestBean(server, customer, null, beanManager, null, null, PersistRequest.Type.INSERT, false, false); diff --git a/src/test/java/org/tests/basic/TestIUDVanilla.java b/src/test/java/org/tests/basic/TestIUDVanilla.java index 0fea46371..f215d1614 100644 --- a/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -48,4 +48,22 @@ public class TestIUDVanilla extends BaseTestCase { Ebean.update(e3); } + + @Test + public void stateless_noOCC() { + + EBasicVer e0 = new EBasicVer("vanilla"); + Ebean.save(e0); + + EBasicVer e3 = new EBasicVer("ModNoOCC"); + e3.setId(e0.getId()); + e3.setLastUpdate(e0.getLastUpdate()); + + Ebean.update(e3); + + e3.setName("ModAgain"); + //e3.setDescription("Banana"); + + Ebean.update(e3); + } } diff --git a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 796e1b8a0..64e1f0a91 100644 --- a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -50,8 +50,8 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { assertEquals(2, loggedSql.size()); // all properties in the bean - assertTrue(loggedSql.get(0), loggedSql.get(0).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind(")); - assertTrue(loggedSql.get(1), loggedSql.get(1).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind(")); + assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind("); + assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, description=?, other=?, last_update=? where id=? and last_update=?; --bind("); } finally { txn.end(); @@ -100,8 +100,8 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(2); - assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=?, last_update=? where id=?; --bind("); - assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, other=?, last_update=? where id=?; --bind("); + assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; --bind("); + assertThat(loggedSql.get(1)).contains("update e_basicver set name=?, other=? where id=?; --bind("); } }