Merge branch 'master' into feature/redundant-local-var

src/main/java/com/avaje/ebean/config/ServerConfig.java

@@ -77,6 +77,12 @@ public class ServerConfig {
    */
   private String name = "db";
 
+  /**
+   * When false (default) H2 automatically uses DDL generate and run
+   * (i.e. assumes we are running tests using in memory h2).
+   */
+  private boolean h2ProductionMode;
+
   /**
    * Typically configuration type objects that are passed by this ServerConfig
    * to plugins. For example - IgniteConfiguration passed to Ignite plugin.
@@ -509,6 +515,27 @@ public class ServerConfig {
     this.name = name;
   }
 
+  /**
+   * Return true if H2 should be used in production mode.
+   * <p>
+   * Otherwise it is assumed we are using H2 for testing and DDL generate and run is turned on.
+   * </p>
+   */
+  public boolean isH2ProductionMode() {
+    return h2ProductionMode;
+  }
+
+  /**
+   * Set to true for H2 to be used in production mode.
+   * <p>
+   * Do this when we want to use H2 and not have the DDL generation and run automatically turned on.
+   * Otherwise it is assumed we are using H2 for testing purposes.
+   * </p>
+   */
+  public void setH2ProductionMode(boolean h2ProductionMode) {
+    this.h2ProductionMode = h2ProductionMode;
+  }
+
   /**
    * Return the container / clustering configuration.
    * <p/>
@@ -1444,6 +1471,12 @@ public class ServerConfig {
    */
   public void setDatabasePlatform(DatabasePlatform databasePlatform) {
     this.databasePlatform = databasePlatform;
+    if (!h2ProductionMode && databasePlatform != null && databasePlatform.isPlatform(Platform.H2)) {
+      // we are using H2 to run tests so turn on DDL generation and run
+      this.ddlGenerate = true;
+      this.ddlRun = true;
+      this.ddlCreateOnly = true;
+    }
   }
 
   /**
@@ -2460,6 +2493,7 @@ public class ServerConfig {
       jsonDateTime = JsonConfig.DateTime.MILLIS;
     }
 
+    h2ProductionMode = p.getBoolean("h2ProductionMode", h2ProductionMode);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
     ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);

src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java

@@ -240,7 +240,7 @@ public class DefaultContainer implements SpiContainer {
       DatabasePlatform db = factory.create(config);
       db.configure(config);
       config.setDatabasePlatform(db);
-      logger.info("DatabasePlatform name:" + config.getName() + " platform:" + db.getName());
+      logger.info("DatabasePlatform name:{} platform:{}", config.getName(), db.getName());
     }
   }
 

src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java

@@ -363,8 +363,15 @@ class CQueryBuilder {
       RawSql.ColumnMapping.Column column = it.next();
       String propertyName = column.getPropertyName();
       if (!RawSqlBuilder.IGNORE_COLUMN.equals(propertyName)) {
-
         ElPropertyValue el = descriptor.getElGetValue(propertyName);
+        if (el == null && propertyName.endsWith("Id")) {
+          // try default naming convention for foreign key columns
+          String foreignIdPath = assocOneIdPath(propertyName);
+          el = descriptor.getElGetValue(foreignIdPath);
+          if (el != null) {
+            propertyName = foreignIdPath;
+          }
+        }
         if (el == null) {
           throw new PersistenceException("Property [" + propertyName + "] not found on " + descriptor.getFullName());
         } else {
@@ -404,6 +411,13 @@ class CQueryBuilder {
     return new SqlTreeBuilder(request, predicates, detail, rawNoId).build();
   }
 
+  /**
+   * Return a path for a foreign key property using the default naming convention.
+   */
+  private String assocOneIdPath(String propertyName) {
+    return propertyName.substring(0, propertyName.length() - 2) + ".id";
+  }
+
   /**
    * Return the SQL response with row limiting (when not an update statement).
    */

src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanRawSql.java

@@ -35,7 +35,13 @@ class CQueryPlanRawSql extends CQueryPlan {
 
     // set the resultSet index positions for the property expressions
     for (int i = 0; i < chain.size(); i++) {
-      indexPositions[i] = 1 + columnMapping.getIndexPosition(chain.get(i));
+      String logicalPropertyPath = chain.get(i);
+      int mappedPosition = columnMapping.getIndexPosition(logicalPropertyPath);
+      if (mappedPosition == -1 && logicalPropertyPath.endsWith(".id")) {
+        // try a automatically mapped foreign key
+        mappedPosition = columnMapping.getIndexPosition(foreignKeyPath(logicalPropertyPath));
+      }
+      indexPositions[i] = 1 + mappedPosition;
     }
 
     // check and handle the case where a discriminator column for
@@ -51,4 +57,12 @@ class CQueryPlanRawSql extends CQueryPlan {
 
     return indexPositions;
   }
+
+  /**
+   * Return the path for a foreign key column that was automatically mapped.
+   */
+  private String foreignKeyPath(String logicalPropertyPath) {
+    // trim the .id and replace with Id ... to reverse the auto fk mapping earlier
+    return logicalPropertyPath.substring(0, logicalPropertyPath.length() - 3) + "Id";
+  }
 }