- * You can create a new EntityBean ( - * {@link EbeanServer#createEntityBean(Class)}, set its Id property and then - * call this setReference() method. - *
- */ - public void setReference(); - /** * Advanced - Used to programmatically build a partially or fully loaded * entity bean. First create an entity bean via diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index b8f6a86f5..e24f760bf 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -453,6 +453,14 @@ public final class Ebean { serverMgr.getPrimaryServer().save(bean); } + /** + * Insert the bean. This is useful when you set the Id property on a bean and + * want to explicitly insert it. + */ + public static void insert(Object bean) { + serverMgr.getPrimaryServer().insert(bean); + } + /** * Force an update using the bean updating the non-null properties. *@@ -496,29 +504,6 @@ public final class Ebean { serverMgr.getPrimaryServer().update(bean); } - /** - * Force an update using the bean explicitly stating the properties to update. - *
- * If you don't specify explicit properties to use in the update then the - * non-null properties are included in the update. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- * - * @param bean - * The bean holding the values to be included in the update. - * @param updateProps - * the explicit set of properties to include in the update (can be - * null). - */ - public static void update(Object bean, Set- * You can use this method to FORCE an update to occur (even on a bean that - * has not been fetched but say built from JSON or XML). When - * {@link EbeanServer#save(Object)} is used Ebean determines whether to use an - * insert or an update based on the state of the bean. Using this method will - * force an update to occur. - *
- *- * It is expected that this method is most useful in stateless REST services - * or web applications where you have the values you wish to update but no - * existing bean. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- * - *
- *
- * Customer c = new Customer();
- * c.setId(7);
- * c.setName("ModifiedNameNoOCC");
- *
- * // generally you should set the version property
- * // so that Optimistic Concurrency Checking is used.
- * // If a version property is not set then no Optimistic
- * // Concurrency Checking occurs for the update
- * // c.setLastUpdate(lastUpdateTime);
- *
- * // by default the Non-null properties
- * // are included in the update
- * ebeanServer.update(c);
- *
- *
- */
- public void update(Object bean, Set- * You can use this method to FORCE an update to occur (even on a bean that - * has not been fetched but say built from JSON or XML). When - * {@link EbeanServer#save(Object)} is used Ebean determines whether to use an - * insert or an update based on the state of the bean. Using this method will - * force an update to occur. - *
- *- * It is expected that this method is most useful in stateless REST services - * or web applications where you have the values you wish to update but no - * existing bean. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- */ - public void update(Object bean, Set* We mark the bean this way rather than immediately fail as we might be batch * lazy loading and this bean might not be used by the client code at all. * Instead we will fail as soon as the client code tries to use this bean. *
*/ - public void setLazyLoadFailure() { - this.lazyLoadFailure = true; + public void checkLazyLoadFailure() { + if (lazyLoadProperty != -1) { + this.lazyLoadFailure = true; + } } /** @@ -490,9 +515,13 @@ public final class EntityBeanIntercept implements Serializable { */ public void setNewBeanForUpdate() { + if (changedProps == null) { + changedProps = new boolean[owner._ebean_getPropertyNames().length]; + } + for (int i=0; i< loadedProps.length; i++) { if (loadedProps[i]) { - setChangedProperty(i); + changedProps[i] = true; } } setDirty(true); diff --git a/src/main/java/com/avaje/ebean/text/csv/CsvReader.java b/src/main/java/com/avaje/ebean/text/csv/CsvReader.java index 2052648f2..d35adc00e 100644 --- a/src/main/java/com/avaje/ebean/text/csv/CsvReader.java +++ b/src/main/java/com/avaje/ebean/text/csv/CsvReader.java @@ -32,7 +32,6 @@ import com.avaje.ebean.text.StringParser; * csvReader.addDateTime("anniversary", "dd-MMM-yyyy"); * csvReader.addProperty("billingAddress.line1"); * csvReader.addProperty("billingAddress.city"); - * csvReader.addReference("billingAddress.country.code"); * * csvReader.process(reader); * @@ -41,8 +40,6 @@ import com.avaje.ebean.text.StringParser; * } * * - * @author rbygrave - * * @param
@@ -300,10 +278,9 @@ public class PersistRequestBean
- * The order of these properties can be relied on to be consistent if the bean - * itself doesn't change or the xml deployment order does not change. - *
- */ - public BeanProperty[] propertiesId() { - return propertiesId; - } - /** * Return the non transient non id properties. */ @@ -2038,14 +1995,6 @@ public class BeanDescriptor
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index dac8f83ea..fed1f003c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -6,8 +6,6 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
-import javax.persistence.PersistenceException;
-
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate;
@@ -24,378 +22,382 @@ import com.avaje.ebeaninternal.server.type.DataBind;
*/
public final class IdBinderEmbedded implements IdBinder {
- private final BeanPropertyAssocOne embIdProperty;
+ private final BeanPropertyAssocOne embIdProperty;
- private final boolean idInExpandedForm;
-
- private BeanProperty[] props;
+ private final boolean idInExpandedForm;
- private BeanDescriptor idDesc;
+ private BeanProperty[] props;
- private String idInValueSql;
-
-
- public IdBinderEmbedded(boolean idInExpandedForm, BeanPropertyAssocOne embIdProperty) {
- this.idInExpandedForm = idInExpandedForm;
- this.embIdProperty = embIdProperty;
+ private BeanDescriptor idDesc;
+
+ private String idInValueSql;
+
+ public IdBinderEmbedded(boolean idInExpandedForm, BeanPropertyAssocOne embIdProperty) {
+ this.idInExpandedForm = idInExpandedForm;
+ this.embIdProperty = embIdProperty;
+ }
+
+ public void initialise() {
+ this.idDesc = embIdProperty.getTargetDescriptor();
+ this.props = embIdProperty.getProperties();
+ this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
+ }
+
+ private String idInExpanded() {
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("(");
+ for (int i = 0; i < props.length; i++) {
+ if (i > 0) {
+ sb.append(" and ");
+ }
+ sb.append(embIdProperty.getName());
+ sb.append(".");
+ sb.append(props[i].getName());
+ sb.append("=?");
+ }
+ sb.append(")");
+
+ return sb.toString();
+ }
+
+ private String idInCompressed() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("(");
+ for (int i = 0; i < props.length; i++) {
+ if (i > 0) {
+ sb.append(",");
+ }
+ sb.append("?");
+ }
+ sb.append(")");
+
+ return sb.toString();
+ }
+
+ @Override
+ public BeanProperty getBeanProperty() {
+ return embIdProperty;
+ }
+
+ public String getOrderBy(String pathPrefix, boolean ascending) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < props.length; i++) {
+ if (i > 0) {
+ sb.append(", ");
+ }
+ if (pathPrefix != null) {
+ sb.append(pathPrefix).append(".");
+ }
+
+ sb.append(embIdProperty.getName()).append(".");
+ sb.append(props[i].getName());
+ if (!ascending) {
+ sb.append(" desc");
+ }
+ }
+ return sb.toString();
+ }
+
+ public BeanDescriptor getIdBeanDescriptor() {
+ return idDesc;
+ }
+
+ public int getPropertyCount() {
+ return props.length;
+ }
+
+ public String getIdProperty() {
+ return embIdProperty.getName();
+ }
+
+ public void buildSelectExpressionChain(String prefix, List
- * The id passed in for binding is expected to be a map with the key being the
- * String name of the property and the value being that properties bind value.
- *