Merge remote-tracking branch 'ebean/master' into pr/enh/post_process_find_controller

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -81,6 +81,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
      */
     ID_LIST(FIND_ID_LIST, "findIds"),
 
+    /**
+     * Find exists.
+     */
+    EXISTS(FIND_EXISTS, "exists"),
+
     /**
      * Find single attribute.
      */

ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java

@@ -26,6 +26,7 @@ public interface TxnProfileEventCodes {
   String FIND_MANY = "fm";
   String FIND_ITERATE = "fe";
   String FIND_ID_LIST = "fi";
+  String FIND_EXISTS = "ex";
   String FIND_ATTRIBUTE = "fa";
   String FIND_COUNT = "fc";
   String FIND_SUBQUERY = "fs";

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java

@@ -15,8 +15,8 @@ final class DefaultQueryPlanListener implements QueryPlanListener {
   @Override
   public void process(QueryPlanCapture capture) {
     // better to log this in JSON form?
-    String dbName = capture.getDatabase().name();
-    for (MetaQueryPlan plan : capture.getPlans()) {
+    String dbName = capture.database().name();
+    for (MetaQueryPlan plan : capture.plans()) {
       log.info("queryPlan  db:{} label:{} queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
         dbName, plan.label(), plan.queryTimeMicros(), plan.profileLocation(),
         plan.sql(), plan.bind(), plan.plan());

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -388,6 +388,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       if (dbSchema != null) {
         migrationRunner.setDefaultDbSchema(dbSchema);
       }
+      migrationRunner.setName(config.getName());
       migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase());
       migrationRunner.loadProperties(config.getProperties());
       migrationRunner.run(config.getDataSource());
@@ -1296,7 +1297,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> boolean exists(Query<T> ormQuery, Transaction transaction) {
     Query<T> ormQueryCopy = ormQuery.copy().setMaxRows(1);
-    SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, ormQueryCopy, transaction);
+    SpiOrmQueryRequest<?> request = createQueryRequest(Type.EXISTS, ormQueryCopy, transaction);
+    List<Object> ids = request.getFromQueryCache();
+    if (ids != null) {
+      return !ids.isEmpty();
+    }
+
     try {
       request.initTransIfRequired();
       return !request.findIds().isEmpty();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -545,6 +545,13 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return importedId;
   }
 
+  /**
+   * Find and return a matching imported id property.
+   */
+  public BeanProperty findMatchImport(String dbCol) {
+    return importedId.findMatchImport(dbCol);
+  }
+
   private String deriveWhereParentIdSql(boolean inClause) {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < exportedProperties.length; i++) {

ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java

@@ -3,11 +3,11 @@ package io.ebeaninternal.server.logger;
 import io.ebeaninternal.api.SpiLogger;
 import org.slf4j.Logger;
 
-public final class DSpiLogger implements SpiLogger {
+final class DSpiLogger implements SpiLogger {
 
   private final Logger logger;
 
-  public DSpiLogger(Logger logger) {
+  DSpiLogger(Logger logger) {
     this.logger = logger;
   }