[maven-release-plugin] prepare release avaje-ebeanorm-7.20.1

FIX: PathTests - on Windows

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm</artifactId>
-  <version>7.17.1</version>
+  <version>7.20.1</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm</name>
@@ -37,7 +37,7 @@
 
   <scm>
     <developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm.git</developerConnection>
-    <tag>avaje-ebeanorm-7.17.1</tag>
+    <tag>avaje-ebeanorm-7.20.1</tag>
   </scm>
 
   <dependencies>
@@ -69,19 +69,19 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-classpath-scanner-api</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
 
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-classpath-scanner</artifactId>
-      <version>2.1.1</version>
+      <version>2.2.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-dbmigration</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.1</version>
     </dependency>
 
     <dependency>
@@ -90,6 +90,12 @@
       <version>[1.7.1,1.7.99)</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.5.3</version>
+    </dependency>
+
     <!-- Jackson core used internally by Ebean -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/com/avaje/ebean/BeanState.java

@@ -38,6 +38,11 @@ public interface BeanState {
    */
   void setDisableLazyLoad(boolean disableLazyLoading);
 
+  /**
+   * Return true if the bean has lazy loading disabled.
+   */
+  boolean isDisableLazyLoad();
+
   /**
    * Set the loaded state of the property given it's name.
    *

src/main/java/com/avaje/ebean/Ebean.java

@@ -945,6 +945,21 @@ public final class Ebean {
     return serverMgr.getDefaultServer().createCsvReader(beanType);
   }
 
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   * </p>
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  public static <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    return serverMgr.getDefaultServer().createNamedQuery(beanType, namedQuery);
+  }
+
   /**
    * Create a query for a type of entity bean.
    * <p>
@@ -960,39 +975,7 @@ public final class Ebean {
    * {@link Query#findSet()} etc will execute against the same EbeanServer from
    * which is was created.
    * </p>
-   * 
-   * <pre>{@code
-   *   // Find order 2 additionally fetching the customer, details and details.product
-   *   // name.
-   * 
-   *   Order order = Ebean.find(Order.class)
-   *     .fetch("customer")
-   *     .fetch("details")
-   *     .fetch("detail.product", "name")
-   *     .setId(2)
-   *     .findUnique();
-   * 
-   *   // Find order 2 additionally fetching the customer, details and details.product
-   *   // name.
-   *   // Note: same query as above but using the query language
-   *   // Note: using a named query would be preferred practice
-   * 
-   *   String oql = "find order fetch customer fetch details fetch details.product (name) where id = :orderId ";
-   * 
-   *   Query<Order> query = Ebean.find(Order.class);
-   *   query.setQuery(oql);
-   *   query.setParameter("orderId", 2);
-   * 
-   *   Order order = query.findUnique();
-   * 
-   *   // Using a named query
-   *   Query<Order> query = Ebean.find(Order.class, "with.details");
-   *   query.setParameter("orderId", 2);
-   * 
-   *   Order order = query.findUnique();
-   * 
-   * }</pre>
-   * 
+   *
    * @param beanType
    *          the class of entity to be fetched
    * @return A ORM Query object for this beanType
@@ -1002,6 +985,47 @@ public final class Ebean {
     return serverMgr.getDefaultServer().createQuery(beanType);
   }
 
+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   *
+   * <h3>Example</h3>
+   *
+   * <pre>{@code
+   *
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = Ebean.createQuery(Order.class, eql);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findUnique();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = Ebean.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findUnique();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param eql The Ebean query
+   * @param <T> The type of the entity bean
+   *
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
+
+    return serverMgr.getDefaultServer().createQuery(beanType, eql);
+  }
+
   /**
    * Create a query for a type of entity bean.
    * <p>

src/main/java/com/avaje/ebean/EbeanServer.java

@@ -199,6 +199,19 @@ public interface EbeanServer {
    */
   <T> UpdateQuery<T> update(Class<T> beanType);
 
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   * </p>
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery);
+
   /**
    * Create a query for an entity bean and synonym for {@link #find(Class)}.
    *
@@ -206,6 +219,43 @@ public interface EbeanServer {
    */
   <T> Query<T> createQuery(Class<T> beanType);
 
+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   *
+   * <h3>Example</h3>
+   *
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = Ebean.createQuery(Order.class, eql);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findUnique();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = Ebean.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findUnique();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param eql The Ebean query
+   * @param <T> The type of the entity bean
+   *
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  <T> Query<T> createQuery(Class<T> beanType, String eql);
+
   /**
    * Create a query for a type of entity bean.
    * <p>

src/main/java/com/avaje/ebean/ExpressionFactory.java

@@ -135,6 +135,11 @@ public interface ExpressionFactory {
    */
   Expression ieq(String propertyName, String value);
 
+  /**
+   * Case Insensitive Equal To that allows for named parameter use.
+   */
+  Expression ieqObject(String propertyName, Object value);
+
   /**
    * Between - property between the two given values.
    */
@@ -192,6 +197,11 @@ public interface ExpressionFactory {
    */
   ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType);
 
+  /**
+   * Like with support for named parameters.
+   */
+  Expression like(String propertyName, Object value, boolean caseInsensitive, LikeType likeType);
+
   /**
    * Like - property like value where the value contains the SQL wild card
    * characters % (percentage) and _ (underscore).

src/main/java/com/avaje/ebean/Junction.java

@@ -59,11 +59,11 @@ package com.avaje.ebean;
  *          .and()
  *            .startsWith("name", "r")
  *            .eq("anniversary", onAfter)
- *            .endJunction()
+ *            .endAnd()
  *          .and()
  *            .eq("status", Customer.Status.ACTIVE)
  *            .gt("id", 0)
- *            .endJunction()
+ *            .endAnd()
  *      .order().asc("name");
  *
  * q.findList();
@@ -84,39 +84,41 @@ public interface Junction<T> extends Expression, ExpressionList<T> {
     /**
      * AND group.
      */
-    AND(" and ", ""),
+    AND(" and ", "", false),
 
     /**
      * OR group.
      */
-    OR(" or ", ""),
+    OR(" or ", "", false),
 
     /**
      * NOT group.
      */
-    NOT(" and ", "not "),
+    NOT(" and ", "not ", false),
 
     /**
      * Text search AND group.
      */
-    MUST("must", ""),
+    MUST("must", "", true),
 
     /**
      * Text search NOT group.
      */
-    MUST_NOT("must_not", ""),
+    MUST_NOT("must_not", "", true),
 
     /**
      * Text search OR group.
      */
-    SHOULD("should", "");
+    SHOULD("should", "", true);
 
-    String prefix;
-    String literal;
+    private String prefix;
+    private String literal;
+    private boolean text;
 
-    Type(String literal, String prefix) {
+    Type(String literal, String prefix, boolean text) {
       this.literal = literal;
       this.prefix = prefix;
+      this.text = text;
     }
 
     /**
@@ -132,6 +134,14 @@ public interface Junction<T> extends Expression, ExpressionList<T> {
     public String prefix() {
       return prefix;
     }
+
+    /**
+     * Return true if this is a text type.
+     */
+    public boolean isText() {
+      return text;
+    }
+
   }
 
 }

src/main/java/com/avaje/ebean/OrderBy.java

@@ -148,6 +148,13 @@ public final class OrderBy<T> implements Serializable {
     return copy;
   }
 
+  /**
+   * Add to the order by by parsing a raw expression.
+   */
+  public void add(String rawExpression) {
+    parse(rawExpression);
+  }
+
   /**
    * Add a property to the order by.
    */
@@ -206,8 +213,9 @@ public final class OrderBy<T> implements Serializable {
    * order by clause and replace.
    * </p>
    */
-  public void clear() {
+  public OrderBy<T> clear() {
     list.clear();
+    return this;
   }
 
   /**

src/main/java/com/avaje/ebean/RawSql.java

@@ -606,9 +606,9 @@ public final class RawSql implements Serializable {
         }
       }
 
-      private static String derivePropertyName(String dbAlias, String dbColumn) {
+      protected static String derivePropertyName(String dbAlias, String dbColumn) {
         if (dbAlias != null) {
-          return dbAlias;
+          return CamelCaseHelper.toCamelFromUnderscore(dbAlias);
         }
         int dotPos = dbColumn.indexOf('.');
         if (dotPos > -1) {

src/main/java/com/avaje/ebean/bean/BeanCollection.java

@@ -31,6 +31,11 @@ public interface BeanCollection<E> extends Serializable {
     ALL
   }
 
+  /**
+   * Set the disableLazyLoad state.
+   */
+  void setDisableLazyLoad(boolean disableLazyLoad);
+
   /**
    * Load bean from another collection.
    */

src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java

@@ -20,6 +20,8 @@ public abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   protected boolean readOnly;
 
+  protected boolean disableLazyLoad;
+
   /**
    * The EbeanServer this is associated with. (used for lazy fetch).
    */
@@ -84,6 +86,11 @@ public abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     this.filterMany = filterMany;
   }
 
+  @Override
+  public void setDisableLazyLoad(boolean disableLazyLoad) {
+    this.disableLazyLoad = disableLazyLoad;
+  }
+
   protected void lazyLoadCollection(boolean onlyIds) {
     if (loader == null) {
       loader = (BeanCollectionLoader) Ebean.getServer(ebeanServerName);

src/main/java/com/avaje/ebean/common/BeanList.java

@@ -102,7 +102,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   private void initClear() {
     synchronized (this) {
       if (list == null) {
-        if (modifyListening) {
+        if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
         } else {
           list = new ArrayList<E>();
@@ -114,7 +114,11 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   private void init() {
     synchronized (this) {
       if (list == null) {
-        lazyLoadCollection(false);
+        if (disableLazyLoad) {
+          list = new ArrayList<E>();
+        } else {
+          lazyLoadCollection(false);
+        }
       }
     }
   }

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

@@ -320,7 +320,7 @@ public class ServerConfig {
   /**
    * Setting to indicate if UUID should be stored as binary(16) or varchar(40) or native DB type (for H2 and Postgres).
    */
-  private DbUuid dbUuid = DbUuid.AUTO;
+  private DbUuid dbUuid = DbUuid.AUTO_VARCHAR;
 
 
   private List<IdGenerator> idGenerators = new ArrayList<IdGenerator>();
@@ -379,19 +379,13 @@ public class ServerConfig {
 
   private boolean transactionRollbackOnChecked = true;
 
-  private boolean registerJmxMBeans = true;
-
   // configuration for the background executor service (thread pool)
 
   private int backgroundExecutorSchedulePoolSize = 1;
-  private int backgroundExecutorCorePoolSize = 1;
-  private int backgroundExecutorMaxPoolSize = 8;
-  private int backgroundExecutorIdleSecs = 60;
   private int backgroundExecutorShutdownSecs = 30;
 
   // defaults for the L2 bean caching
 
-  private int cacheWarmingDelay = 30;
   private int cacheMaxSize = 10000;
   private int cacheMaxIdleTime = 600;
   private int cacheMaxTimeToLive = 60 * 60 * 6;
@@ -409,7 +403,7 @@ public class ServerConfig {
   private boolean expressionEqualsWithNullAsNoop;
 
   /**
-   * Set to true to use native ILIKE expression (if support by datasbase platform / like Postgres).
+   * Set to true to use native ILIKE expression (if support by database platform / like Postgres).
    */
   private boolean expressionNativeIlike;
 
@@ -1042,20 +1036,6 @@ public class ServerConfig {
     this.transactionRollbackOnChecked = transactionRollbackOnChecked;
   }
 
-  /**
-   * Return true if the server should register JMX MBeans.
-   */
-  public boolean isRegisterJmxMBeans() {
-    return registerJmxMBeans;
-  }
-
-  /**
-   * Set if the server should register JMX MBeans.
-   */
-  public void setRegisterJmxMBeans(boolean registerJmxMBeans) {
-    this.registerJmxMBeans = registerJmxMBeans;
-  }
-
   /**
    * Return the Background executor schedule pool size. Defaults to 1.
    */
@@ -1070,48 +1050,6 @@ public class ServerConfig {
     this.backgroundExecutorSchedulePoolSize = backgroundExecutorSchedulePoolSize;
   }
 
-  /**
-   * Return the Background executor core pool size.
-   */
-  public int getBackgroundExecutorCorePoolSize() {
-    return backgroundExecutorCorePoolSize;
-  }
-
-  /**
-   * Set the Background executor core pool size.
-   */
-  public void setBackgroundExecutorCorePoolSize(int backgroundExecutorCorePoolSize) {
-    this.backgroundExecutorCorePoolSize = backgroundExecutorCorePoolSize;
-  }
-
-  /**
-   * Return the Background executor max pool size.
-   */
-  public int getBackgroundExecutorMaxPoolSize() {
-    return backgroundExecutorMaxPoolSize;
-  }
-
-  /**
-   * Set the Background executor max pool size.
-   */
-  public void setBackgroundExecutorMaxPoolSize(int backgroundExecutorMaxPoolSize) {
-    this.backgroundExecutorMaxPoolSize = backgroundExecutorMaxPoolSize;
-  }
-
-  /**
-   * Return the Background executor idle seconds.
-   */
-  public int getBackgroundExecutorIdleSecs() {
-    return backgroundExecutorIdleSecs;
-  }
-
-  /**
-   * Set the Background executor idle seconds.
-   */
-  public void setBackgroundExecutorIdleSecs(int backgroundExecutorIdleSecs) {
-    this.backgroundExecutorIdleSecs = backgroundExecutorIdleSecs;
-  }
-
   /**
    * Return the Background executor shutdown seconds. This is the time allowed for the pool to shutdown nicely
    * before it is forced shutdown.
@@ -1128,20 +1066,6 @@ public class ServerConfig {
     this.backgroundExecutorShutdownSecs = backgroundExecutorShutdownSecs;
   }
 
-  /**
-   * Return the cache warming delay in seconds.
-   */
-  public int getCacheWarmingDelay() {
-    return cacheWarmingDelay;
-  }
-
-  /**
-   * Set the cache warming delay in seconds.
-   */
-  public void setCacheWarmingDelay(int cacheWarmingDelay) {
-    this.cacheWarmingDelay = cacheWarmingDelay;
-  }
-
   /**
    * Return the L2 cache default max size.
    */
@@ -2399,6 +2323,8 @@ public class ServerConfig {
     autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
 
+    backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
+    backgroundExecutorShutdownSecs = p.getInt("backgroundExecutorShutdownSecs", backgroundExecutorShutdownSecs);
     disableClasspathSearch = p.getBoolean("disableClasspathSearch", disableClasspathSearch);
     currentUserProvider = createInstance(p, CurrentUserProvider.class, "currentUserProvider", currentUserProvider);
     databasePlatform = createInstance(p, DatabasePlatform.class, "databasePlatform", databasePlatform);
@@ -2408,7 +2334,6 @@ public class ServerConfig {
     dbEncrypt = createInstance(p, DbEncrypt.class, "dbEncrypt", dbEncrypt);
     serverCachePlugin = createInstance(p, ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
     serverCacheManager = createInstance(p, ServerCacheManager.class, "serverCacheManager", serverCacheManager);
-    cacheWarmingDelay = p.getInt("cacheWarmingDelay", cacheWarmingDelay);
 
     if (packages != null) {
       String packagesProp = p.get("search.packages", p.get("packages", null));
@@ -2615,18 +2540,45 @@ public class ServerConfig {
   public enum DbUuid {
 
     /**
-     * Store using native UUID in H2 and Postgres.
+     * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
      */
-    AUTO,
+    AUTO_VARCHAR(true, false),
 
     /**
-     * Store using DB VARCHAR.
+     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16).
      */
-    VARCHAR,
+    AUTO_BINARY(true, true),
 
     /**
-     * Store using DB BINARY.
+     * Store using DB VARCHAR(40).
      */
-    BINARY
+    VARCHAR(false, false),
+
+    /**
+     * Store using DB BINARY(16).
+     */
+    BINARY(false, true);
+
+    boolean nativeType;
+    boolean binary;
+
+    DbUuid(boolean nativeType, boolean binary) {
+      this.nativeType = nativeType;
+      this.binary = binary;
+    }
+
+    /**
+     * Return true if native UUID type is preferred.
+     */
+    public boolean useNativeType() {
+      return nativeType;
+    }
+
+    /**
+     * Return true if BINARY(16) storage is preferred over VARCHAR(40).
+     */
+    public boolean useBinary() {
+      return binary;
+    }
   }
 }

src/main/java/com/avaje/ebean/config/dbplatform/DatabasePlatform.java

@@ -182,8 +182,11 @@ public class DatabasePlatform {
   public DatabasePlatform() {
   }
 
-  public void configure(Properties properties) {
-    // by default do nothing
+  /**
+   * Configure UUID Storage etc based on ServerConfig settings.
+   */
+  public void configure(ServerConfig serverConfig) {
+    dbTypeMap.config(nativeUuidType, serverConfig.getDbUuid());
   }
 
   /**

src/main/java/com/avaje/ebean/config/dbplatform/DbType.java

@@ -152,4 +152,10 @@ public class DbType {
     return sb.toString();
   }
 
+  /**
+   * Create a copy of the type with a new default length.
+   */
+  public DbType withLength(int defaultLength) {
+    return new DbType(name, defaultLength);
+  }
 }

src/main/java/com/avaje/ebean/config/dbplatform/DbTypeMap.java

@@ -1,5 +1,7 @@
 package com.avaje.ebean.config.dbplatform;
 
+import com.avaje.ebean.config.ServerConfig;
+
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
@@ -9,6 +11,8 @@ import java.util.Map;
  */
 public class DbTypeMap {
 
+  private static final DbType UUID_NATIVE = new DbType("uuid", false);
+  private static final DbType UUID_PLACEHOLDER = new DbType("uuidPlaceholder");
   private static final DbType JSON_CLOB_PLACEHOLDER = new DbType("jsonClobPlaceholder");
   private static final DbType JSON_BLOB_PLACEHOLDER = new DbType("jsonBlobPlaceholder");
   private static final DbType JSON_VARCHAR_PLACEHOLDER = new DbType("jsonVarcharPlaceholder");
@@ -66,7 +70,7 @@ public class DbTypeMap {
 
   /**
    * Return the DbTypeMap with standard (not platform specific) types.
-   *
+   * <p>
    * This has some extended JSON types (JSON, JSONB, JSONVarchar, JSONClob, JSONBlob).
    * These types get translated to specific database platform types during DDL generation.
    */
@@ -104,8 +108,6 @@ public class DbTypeMap {
     put(Types.BLOB, new DbType("blob"));
     put(Types.CLOB, new DbType("clob"));
 
-    // DB native UUID support (H2 and Postgres)
-    put(DbType.UUID, new DbType("uuid"));
     put(Types.ARRAY, new DbType("array"));
 
     if (logicalTypes) {
@@ -116,6 +118,7 @@ public class DbTypeMap {
       put(DbType.JSONClob, new DbType("jsonclob"));
       put(DbType.JSONBlob, new DbType("jsonblob"));
       put(DbType.JSONVarchar, new DbType("jsonvarchar", 1000));
+      put(DbType.UUID, UUID_NATIVE);
 
     } else {
       put(DbType.JSON, JSON_CLOB_PLACEHOLDER); // Postgres maps this to JSON
@@ -123,6 +126,7 @@ public class DbTypeMap {
       put(DbType.JSONClob, JSON_CLOB_PLACEHOLDER);
       put(DbType.JSONBlob, JSON_BLOB_PLACEHOLDER);
       put(DbType.JSONVarchar, JSON_VARCHAR_PLACEHOLDER);
+      put(DbType.UUID, UUID_PLACEHOLDER);
     }
 
     put(Types.LONGVARBINARY, new DbType("longvarbinary"));
@@ -133,7 +137,6 @@ public class DbTypeMap {
     put(Types.DATE, new DbType("date"));
     put(Types.TIME, new DbType("time"));
     put(Types.TIMESTAMP, new DbType("timestamp"));
-
   }
 
   /**
@@ -191,4 +194,17 @@ public class DbTypeMap {
   public DbType get(int jdbcType) {
     return typeMap.get(jdbcType);
   }
+
+  /**
+   * Map the UUID appropriately based on native DB support and ServerConfig.DbUuid.
+   */
+  public void config(boolean nativeUuidType, ServerConfig.DbUuid dbUuid) {
+    if (nativeUuidType && dbUuid.useNativeType()) {
+      put(DbType.UUID, UUID_NATIVE);
+    } else if (dbUuid.useBinary()) {
+      put(DbType.UUID, get(Types.BINARY).withLength(16));
+    } else {
+      put(DbType.UUID, get(Types.VARCHAR).withLength(40));
+    }
+  }
 }

src/main/java/com/avaje/ebean/config/dbplatform/H2HistoryTrigger.java

@@ -9,9 +9,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * H2 database trigger used to populate history tables to support the @History feature.
@@ -54,7 +52,6 @@ public class H2HistoryTrigger implements Trigger {
     insertSql.append("insert into ").append(tableName).append(HISTORY_SUFFIX).append(" (");
 
     int count = 0;
-    List<String> columns = new ArrayList<String>();
     while (rs.next()) {
       if (++count > 1) {
         insertSql.append(",");
@@ -66,7 +63,6 @@ public class H2HistoryTrigger implements Trigger {
         this.effectEndPosition = count - 1;
       }
       insertSql.append(columnName);
-      columns.add(columnName);
     }
     insertSql.append(") values (");
     for (int i = 0; i < count; i++) {

src/main/java/com/avaje/ebean/config/dbplatform/H2Platform.java

@@ -1,6 +1,7 @@
 package com.avaje.ebean.config.dbplatform;
 
 import com.avaje.ebean.BackgroundExecutor;
+import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.dbmigration.ddlgeneration.platform.H2Ddl;
 
 import javax.sql.DataSource;
@@ -34,11 +35,14 @@ public class H2Platform extends DatabasePlatform {
   }
 
   @Override
-  public void configure(Properties properties) {
-    super.configure(properties);
-    String idType = properties.getProperty("ebean.h2.idtype");
-    if (idType != null) {
-      this.dbIdentity.setIdType(IdType.valueOf(idType));
+  public void configure(ServerConfig serverConfig) {
+    super.configure(serverConfig);
+    Properties properties = serverConfig.getProperties();
+    if (properties != null) {
+      String idType = properties.getProperty("ebean.h2.idtype");
+      if (idType != null) {
+        this.dbIdentity.setIdType(IdType.valueOf(idType));
+      }
     }
   }
 

src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java

@@ -64,12 +64,15 @@ public class PostgresPlatform extends DatabasePlatform {
   }
 
   @Override
-  public void configure(Properties properties) {
-    super.configure(properties);
-    String tsType = properties.getProperty("ebean.postgres.timestamp");
-    if (tsType != null) {
-      // set timestamp type to "timestamp" without time zone
-      dbTypeMap.put(Types.TIMESTAMP, new DbType(tsType));
+  public void configure(ServerConfig serverConfig) {
+    super.configure(serverConfig);
+    Properties properties = serverConfig.getProperties();
+    if (properties != null) {
+      String tsType = properties.getProperty("ebean.postgres.timestamp");
+      if (tsType != null) {
+        // set timestamp type to "timestamp" without time zone
+        dbTypeMap.put(Types.TIMESTAMP, new DbType(tsType));
+      }
     }
   }
 

src/main/java/com/avaje/ebean/dbmigration/DbMigration.java

@@ -164,9 +164,6 @@ public class DbMigration {
    * </p>
    */
   public void addPlatform(DbPlatformName platform, String prefix) {
-    if (!prefix.endsWith("-")) {
-      prefix += "-";
-    }
     platforms.add(new Pair(getPlatform(platform), prefix));
   }
 
@@ -204,13 +201,20 @@ public class DbMigration {
 
     // use this flag to stop other plugins like full DDL generation
     if (!online) {
-      DbOffline.setRunningMigration();
+      DbOffline.setGenerateMigration();
+      if (databasePlatform == null || !platforms.isEmpty()) {
+        // for multiple platform generation set the general platform
+        // to H2 so that it runs offline without DB connection
+        setPlatform(DbPlatformName.H2);
+      }
     }
     setDefaults();
     try {
       Request request = createRequest();
 
-      generateExtraDdl(request);
+      if (platforms.isEmpty()) {
+        generateExtraDdl(request.migrationDir, databasePlatform);
+      }
 
       String pendingVersion = generatePendingDrop();
       if (pendingVersion != null) {
@@ -234,15 +238,15 @@ public class DbMigration {
    * migration runner.
    * </p>
    */
-  private void generateExtraDdl(Request request) throws IOException {
+  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
 
-    if (databasePlatform != null) {
+    if (dbPlatform != null) {
       ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
       if (extraDdl != null) {
         List<DdlScript> ddlScript = extraDdl.getDdlScript();
         for (DdlScript script : ddlScript) {
-          if (ExtraDdlXmlReader.matchPlatform(databasePlatform.getName(), script.getPlatforms())) {
-            writeExtraDdl(request, script);
+          if (ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+            writeExtraDdl(migrationDir, script);
           }
         }
       }
@@ -252,13 +256,13 @@ public class DbMigration {
   /**
    * Write (or override) the "repeatable" migration script.
    */
-  private void writeExtraDdl(Request request, DdlScript script) throws IOException {
+  private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
 
     String fullName = repeatableMigrationName(script.getName());
 
     logger.info("writing repeatable script {}", fullName);
 
-    File file = new File(request.migrationDir, fullName);
+    File file = new File(migrationDir, fullName);
     FileWriter writer = new FileWriter(file);
     writer.write(script.getValue());
     writer.flush();
@@ -363,14 +367,16 @@ public class DbMigration {
       logger.warn("migration already exists, not generating DDL");
 
     } else {
-      if (databasePlatform != null) {
+      if (!platforms.isEmpty()) {
+        writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
+
+      } else if (databasePlatform != null) {
         // writer needs the current model to provide table/column details for
         // history ddl generation (triggers, history tables etc)
         DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
         PlatformDdlWriter writer = createDdlWriter(databasePlatform, "");
         writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
       }
-      writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
     }
   }
 
@@ -426,7 +432,10 @@ public class DbMigration {
     for (Pair pair : platforms) {
       DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
       PlatformDdlWriter platformWriter = createDdlWriter(pair);
-      platformWriter.processMigration(dbMigration, platformBuffer, writePath, fullVersion);
+      File subPath = platformWriter.subPath(writePath, pair.prefix);
+      platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
+
+      generateExtraDdl(subPath, pair.platform);
     }
   }
 

src/main/java/com/avaje/ebean/dbmigration/DbOffline.java

@@ -14,7 +14,7 @@ public class DbOffline {
 
   private static final String KEY = "ebean.dboffline";
 
-  private static boolean runningMigration;
+  private static boolean generateMigration;
 
   /**
    * Set the platform to use when creating the next EbeanServer instance.
@@ -55,23 +55,23 @@ public class DbOffline {
    * Return true if the migration is running. This typically means don't run the
    * plugins like full DDL generation.
    */
-  public static boolean isRunningMigration() {
-    return runningMigration;
+  public static boolean isGenerateMigration() {
+    return generateMigration;
   }
 
   /**
    * Called when the migration is running is order to stop other plugins
    * like the full DDL generation from executing.
    */
-  public static void setRunningMigration() {
-    runningMigration = true;
+  public static void setGenerateMigration() {
+    generateMigration = true;
   }
 
   /**
    * Reset the offline platform and runningMigration flag.
    */
   public static void reset() {
-    runningMigration = false;
+    generateMigration = false;
     System.clearProperty(KEY);
     logger.debug("reset");
   }

src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java

@@ -96,7 +96,13 @@ public class DdlGenerator {
     Transaction transaction = server.createTransaction();
     Connection connection = transaction.getConnection();
     try {
+      if (expectErrors) {
+        connection.setAutoCommit(true);
+      }
       int count = runner.runAll(content, connection);
+      if (expectErrors) {
+        connection.setAutoCommit(false);
+      }
       transaction.commit();
       return count;
 

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java

@@ -583,6 +583,12 @@ public class BaseTableDdl implements TableDdl {
       }
     }
 
+    for (Column column : columns) {
+      if (hasValue(column.getReferences())) {
+        writeForeignKey(writer, tableName, column);
+      }
+    }
+
     // add a bit of whitespace
     writer.apply().end();
   }
@@ -831,9 +837,10 @@ public class BaseTableDdl implements TableDdl {
 
   protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException {
 
+    String convertedType = platformDdl.convert(column.getType(), false);
     buffer.append("alter table ").append(tableName)
         .append(" add column ").append(column.getName())
-        .append(" ").append(column.getType());
+        .append(" ").append(convertedType);
 
     if (!onHistoryTable) {
       if (isTrue(column.isNotnull())) {

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java

@@ -26,6 +26,8 @@ import java.util.List;
  */
 public class PlatformDdl {
 
+  protected final DatabasePlatform platform;
+
   protected PlatformHistoryDdl historyDdl = new NoHistorySupportDdl();
 
   /**
@@ -98,6 +100,7 @@ public class PlatformDdl {
   protected final DbDefaultValue dbDefaultValue;
 
   public PlatformDdl(DatabasePlatform platform) {
+    this.platform = platform;
     this.dbIdentity = platform.getDbIdentity();
     this.dbDefaultValue = platform.getDbDefaultValue();
     this.typeConverter = new PlatformTypeConverter(platform.getDbTypeMap());
@@ -107,6 +110,7 @@ public class PlatformDdl {
    * Set configuration options.
    */
   public void configure(ServerConfig serverConfig) {
+    platform.configure(serverConfig);
     historyDdl.configure(serverConfig, this);
     naming = serverConfig.getConstraintNaming();
   }

src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java

@@ -11,7 +11,6 @@ import com.avaje.ebean.dbmigration.model.visitor.VisitAllUsing;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * Reads EbeanServer bean descriptors to build the current model.
@@ -24,6 +23,8 @@ public class CurrentModel {
 
   private final DbConstraintNaming.MaxLength maxLength;
 
+  private final boolean platformTypes;
+
   private ModelContainer model;
 
   private ChangeSet changeSet;
@@ -31,32 +32,31 @@ public class CurrentModel {
   private DdlWrite write;
 
   /**
-   * Construct with a given EbeanServer instance.
+   * Construct with a given EbeanServer instance for DDL create all generation, not migration.
    */
   public CurrentModel(SpiEbeanServer server) {
-    this(server, server.getServerConfig().getConstraintNaming());
+    this(server, server.getServerConfig().getConstraintNaming(), true);
   }
 
   /**
    * Construct with a given EbeanServer, platformDdl and constraintNaming convention.
    * <p>
-   *   Note the EbeanServer is just used to read the BeanDescriptors and platformDdl supplies
-   *   the platform specific handling on
+   * Note the EbeanServer is just used to read the BeanDescriptors and platformDdl supplies
+   * the platform specific handling on
    * </p>
    */
   public CurrentModel(SpiEbeanServer server, DbConstraintNaming constraintNaming) {
+    this(server, constraintNaming, false);
+  }
+
+  private CurrentModel(SpiEbeanServer server, DbConstraintNaming constraintNaming, boolean platformTypes) {
     this.server = server;
     this.constraintNaming = constraintNaming;
     this.maxLength = maxLength(server, constraintNaming);
+    this.platformTypes = platformTypes;
   }
 
-  public CurrentModel(SpiEbeanServer server, DbConstraintNaming constraintNaming, int maxConstraintLength) {
-    this.server = server;
-    this.constraintNaming = constraintNaming;
-    this.maxLength = new DefaultConstraintMaxLength(maxConstraintLength);
-  }
-
-  private DbConstraintNaming.MaxLength maxLength(SpiEbeanServer server, DbConstraintNaming naming) {
+  private static DbConstraintNaming.MaxLength maxLength(SpiEbeanServer server, DbConstraintNaming naming) {
 
     if (naming.getMaxLength() != null) {
       return naming.getMaxLength();
@@ -73,7 +73,7 @@ public class CurrentModel {
     if (model == null) {
       model = new ModelContainer();
 
-      ModelBuildContext context = new ModelBuildContext(model, constraintNaming, maxLength);
+      ModelBuildContext context = new ModelBuildContext(model, constraintNaming, maxLength, platformTypes);
       ModelBuildBeanVisitor visitor = new ModelBuildBeanVisitor(context);
       VisitAllUsing visit = new VisitAllUsing(visitor, server);
       visit.visitAllBeans();

src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java

@@ -9,6 +9,8 @@ import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite;
 import com.avaje.ebean.dbmigration.migration.ChangeSet;
 import com.avaje.ebean.dbmigration.migration.ChangeSetType;
 import com.avaje.ebean.dbmigration.migration.Migration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -21,6 +23,8 @@ import java.util.List;
  */
 public class PlatformDdlWriter {
 
+  private static final Logger logger = LoggerFactory.getLogger(PlatformDdlWriter.class);
+
   private final ServerConfig serverConfig;
 
   private final DatabasePlatform platform;
@@ -67,7 +71,7 @@ public class PlatformDdlWriter {
   protected void writePlatformDdl(DdlWrite write, File resourcePath, String fullVersion) throws IOException {
 
     if (!write.isApplyEmpty()) {
-      FileWriter applyWriter = createWriter(resourcePath, fullVersion, "", config.getApplySuffix());
+      FileWriter applyWriter = createWriter(resourcePath, fullVersion, config.getApplySuffix());
       try {
         writeApplyDdl(applyWriter, write);
         applyWriter.flush();
@@ -77,28 +81,12 @@ public class PlatformDdlWriter {
     }
   }
 
-  protected FileWriter createWriter(File path, String fullVersion, String subPath, String suffix) throws IOException {
+  protected FileWriter createWriter(File path, String fullVersion, String suffix) throws IOException {
 
-    String fileName = fullVersion;
-    if (!platformPrefix.isEmpty()) {
-      fileName += "-"+platformPrefix;
-    }
-    if (subPath != null && !subPath.isEmpty()) {
-      path = subPath(path, subPath);
-    }
-    fileName += suffix;
-    File applyFile = new File(path,  fileName);
+    File applyFile = new File(path,  fullVersion + suffix);
     return new FileWriter(applyFile);
   }
 
-  protected File subPath(File path, String suffix) {
-    File subPath = new File(path, suffix);
-    if (!subPath.exists()) {
-      subPath.mkdirs();
-    }
-    return subPath;
-  }
-
   /**
    * Write the 'Apply' DDL buffers to the writer.
    */
@@ -127,4 +115,17 @@ public class PlatformDdlWriter {
     return platform.createDdlHandler(serverConfig);
   }
 
+  /**
+   * Return a sub directory (for multi-platform ddl generation).
+   */
+  public File subPath(File path, String suffix) {
+    File subPath = new File(path, suffix);
+    if (!subPath.exists()) {
+      if (!subPath.mkdirs()) {
+        logger.error("failed to create directories for " + subPath.getAbsolutePath());
+      }
+    }
+    return subPath;
+  }
+
 }

src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java

@@ -29,10 +29,13 @@ public class ModelBuildContext {
 
   private final DbConstraintNaming.MaxLength maxLength;
 
-  public ModelBuildContext(ModelContainer model, DbConstraintNaming naming, DbConstraintNaming.MaxLength maxLength) {
+  private final boolean platformTypes;
+
+  public ModelBuildContext(ModelContainer model, DbConstraintNaming naming, DbConstraintNaming.MaxLength maxLength, boolean platformTypes) {
     this.model = model;
     this.constraintNaming = naming;
     this.maxLength = maxLength;
+    this.platformTypes = platformTypes;
   }
 
   /**
@@ -132,7 +135,7 @@ public class ModelBuildContext {
     }
 
     // can be the logical JSON types (JSON, JSONB, JSONClob, JSONBlob, JSONVarchar)
-    int dbType = p.getDbType();
+    int dbType = p.getDbType(platformTypes);
     if (dbType == 0) {
       throw new RuntimeException("No scalarType defined for " + p.getFullBeanName());
     }

src/main/java/com/avaje/ebean/util/CamelCaseHelper.java

@@ -12,9 +12,12 @@ public class CamelCaseHelper {
    */
   public static String toCamelFromUnderscore(String underscore) {
 
-    StringBuilder result = new StringBuilder();
     String[] vals = underscore.split("_");
+    if (vals.length == 1) {
+      return underscore;
+    }
 
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < vals.length; i++) {
       String lower = vals[i].toLowerCase();
       if (i > 0) {

src/main/java/com/avaje/ebean/util/StringHelper.java

@@ -398,7 +398,7 @@ public class StringHelper {
       int additionalSize, int startPos, int endPos) {
 
     if (source == null) {
-      return source;
+      return null;
     }
 
     char match0 = match.charAt(0);

src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java

@@ -13,7 +13,12 @@ import java.io.IOException;
  */
 public interface SpiExpression extends Expression {
 
-  /**
+	/**
+	 * Simplify nested expressions if possible.
+	 */
+	void simplify();
+
+	/**
    * Write the expression as an elastic search expression.
    */
   void writeDocQuery(DocQueryContext context) throws IOException;

src/main/java/com/avaje/ebeaninternal/api/SpiNamedParam.java

@@ -0,0 +1,6 @@
+package com.avaje.ebeaninternal.api;
+
+public interface SpiNamedParam {
+
+  Object getValue();
+}

src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java

@@ -222,6 +222,16 @@ public interface SpiQuery<T> extends Query<T> {
    */
   Timestamp getAsOf();
 
+  /**
+   * Return true if the base table is using history.
+   */
+  boolean isAsOfBaseTable();
+
+  /**
+   * Set when the base table is using history.
+   */
+  void setAsOfBaseTable();
+
   /**
    * Increment the counter of tables used in 'As Of' query.
    */
@@ -296,6 +306,16 @@ public interface SpiQuery<T> extends Query<T> {
    */
   void setLoadDescription(String loadMode, String loadDescription);
 
+  /**
+   * Check that the named parameters have had their values set.
+   */
+  void checkNamedParameters();
+
+  /**
+   * Create a named parameter placeholder.
+   */
+  SpiNamedParam createNamedParameter(String parameterName);
+
   /**
    * Return the joins required to support predicates on the many properties.
    */
@@ -542,12 +562,6 @@ public interface SpiQuery<T> extends Query<T> {
    */
   BindParams getBindParams();
 
-  /**
-   * Get the orm query as a String. Only available if the query was built from
-   * a string.
-   */
-  String getQuery();
-
   /**
    * Replace the query detail. This is used by the AutoTune feature to as a
    * fast way to set the query properties and joins.
@@ -564,6 +578,11 @@ public interface SpiQuery<T> extends Query<T> {
    */
   boolean tuneFetchProperties(OrmQueryDetail detail);
 
+  /**
+   * If this is a RawSql based entity set the default RawSql if not set.
+   */
+  void setDefaultRawSqlIfRequired();
+
   /**
    * Set to true if this query has been tuned by autoTune.
    */
@@ -686,4 +705,8 @@ public interface SpiQuery<T> extends Query<T> {
    */
   OrmUpdateProperties getUpdateProperties();
 
+  /**
+   * Simplify nested expression lists where possible.
+   */
+  void simplifyExpressions();
 }

src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java

@@ -45,9 +45,8 @@ public class ProfileOriginNodeUsage {
       if (path != null) {
         ElPropertyValue elGetValue = rootDesc.getElGetValue(path);
         if (elGetValue == null) {
-          desc = null;
           logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.getName());
-
+          return;
         } else {
           BeanProperty beanProperty = elGetValue.getBeanProperty();
           if (beanProperty instanceof BeanPropertyAssoc<?>) {

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

@@ -1,35 +1,25 @@
 package com.avaje.ebeaninternal.server.core;
 
-import java.util.concurrent.TimeUnit;
-
 import com.avaje.ebeaninternal.api.SpiBackgroundExecutor;
+import com.avaje.ebeaninternal.server.lib.DaemonExecutorService;
 import com.avaje.ebeaninternal.server.lib.DaemonScheduleThreadPool;
-import com.avaje.ebeaninternal.server.lib.DaemonThreadPool;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * The default implementation of the BackgroundExecutor.
  */
 public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
-	private final DaemonThreadPool pool;
-	
 	private final DaemonScheduleThreadPool schedulePool;
 
+  private final DaemonExecutorService pool;
+
   /**
    * Construct the default implementation of BackgroundExecutor.
-   *
-   * @param corePoolSize
-   *            the core size of the thread pool.
-   * @param maximumPoolSize
-   *            the maximum pool size before jobs are queued
-   * @param keepAliveSecs
-   *            the time in seconds idle threads are keep alive
-   * @param shutdownWaitSeconds
-   *            the time in seconds allowed for the pool to shutdown nicely.
-   *            After this the pool is forced to shutdown.
    */
-	public DefaultBackgroundExecutor(int schedulePoolSize, int corePoolSize, int maximumPoolSize, long keepAliveSecs,int shutdownWaitSeconds, String namePrefix) {
-		this.pool = new DaemonThreadPool(corePoolSize, maximumPoolSize, keepAliveSecs, shutdownWaitSeconds, namePrefix);
+	public DefaultBackgroundExecutor(int schedulePoolSize, int shutdownWaitSeconds, String namePrefix) {
+		this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
 		this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix+"-periodic-");
 	}
 

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

@@ -14,14 +14,14 @@ import java.util.Set;
  */
 public class DefaultBeanState implements BeanState {
 
-	private final EntityBean entityBean;
-	
-	private final EntityBeanIntercept intercept;
-	
-	public DefaultBeanState(EntityBean  entityBean){
-		this.entityBean = entityBean;
-		this.intercept = entityBean._ebean_getIntercept();
-	}
+  private final EntityBean entityBean;
+
+  private final EntityBeanIntercept intercept;
+
+  public DefaultBeanState(EntityBean entityBean) {
+    this.entityBean = entityBean;
+    this.intercept = entityBean._ebean_getIntercept();
+  }
 
   public void setPropertyLoaded(String propertyName, boolean loaded) {
     intercept.setPropertyLoaded(propertyName, loaded);
@@ -31,52 +31,57 @@ public class DefaultBeanState implements BeanState {
     return intercept.isReference();
   }
 
-	public boolean isNew() {
-		return intercept.isNew();
-	}
-
-	public boolean isNewOrDirty() {
-		return intercept.isNewOrDirty();
-	}
-
-	public boolean isDirty() {
-		return intercept.isDirty();
-	}
-	
-	public Set<String> getLoadedProps() {
-	  return intercept.getLoadedPropertyNames();
-	}
-	
-	public Set<String> getChangedProps() {
-	  return intercept.getDirtyPropertyNames();
+  public boolean isNew() {
+    return intercept.isNew();
   }
-	
-  public Map<String,ValuePair> getDirtyValues() {
+
+  public boolean isNewOrDirty() {
+    return intercept.isNewOrDirty();
+  }
+
+  public boolean isDirty() {
+    return intercept.isDirty();
+  }
+
+  public Set<String> getLoadedProps() {
+    return intercept.getLoadedPropertyNames();
+  }
+
+  public Set<String> getChangedProps() {
+    return intercept.getDirtyPropertyNames();
+  }
+
+  public Map<String, ValuePair> getDirtyValues() {
     return intercept.getDirtyValues();
   }
-	
-	public boolean isReadOnly() {
-		return intercept.isReadOnly();
-	}
-	
-	public void setReadOnly(boolean readOnly){
-		intercept.setReadOnly(readOnly);
-	}
-	
-	public void addPropertyChangeListener(PropertyChangeListener listener) {
-		entityBean.addPropertyChangeListener(listener);
-	}
-	
-	public void removePropertyChangeListener(PropertyChangeListener listener) {
-		entityBean.removePropertyChangeListener(listener);
-	}
 
-	public void setLoaded() {
-	  intercept.setLoaded();
-	}
+  public boolean isReadOnly() {
+    return intercept.isReadOnly();
+  }
+
+  public void setReadOnly(boolean readOnly) {
+    intercept.setReadOnly(readOnly);
+  }
+
+  public void addPropertyChangeListener(PropertyChangeListener listener) {
+    entityBean.addPropertyChangeListener(listener);
+  }
+
+  public void removePropertyChangeListener(PropertyChangeListener listener) {
+    entityBean.removePropertyChangeListener(listener);
+  }
+
+  public void setLoaded() {
+    intercept.setLoaded();
+  }
 
   @Override
   public void setDisableLazyLoad(boolean disableLazyLoading) {
     intercept.setDisableLazyLoad(disableLazyLoading);
   }
+
+  @Override
+  public boolean isDisableLazyLoad() {
+    return intercept.isDisableLazyLoad();
+  }
 }

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

@@ -78,14 +78,10 @@ public class DefaultContainer implements SpiContainer {
   private SpiBackgroundExecutor createBackgroundExecutor(ServerConfig serverConfig) {
 
     String namePrefix = "ebean-" + serverConfig.getName();
-
     int schedulePoolSize = serverConfig.getBackgroundExecutorSchedulePoolSize();
-    int corePoolSize = serverConfig.getBackgroundExecutorCorePoolSize();
-    int maxPoolSize = serverConfig.getBackgroundExecutorMaxPoolSize();
-    int idleSecs = serverConfig.getBackgroundExecutorIdleSecs();
     int shutdownSecs = serverConfig.getBackgroundExecutorShutdownSecs();
 
-    return new DefaultBackgroundExecutor(schedulePoolSize, corePoolSize, maxPoolSize, idleSecs, shutdownSecs, namePrefix);
+    return new DefaultBackgroundExecutor(schedulePoolSize, shutdownSecs, namePrefix);
   }
 
   /**
@@ -122,22 +118,20 @@ public class DefaultContainer implements SpiContainer {
 
       // generate and run DDL if required
       // if there are any other tasks requiring action in their plugins, do them as well
-      if (!DbOffline.isRunningMigration()) {
+      if (!DbOffline.isGenerateMigration()) {
         server.executePlugins(online);
-      }
 
-      // initialise prior to registering with clusterManager
-      server.initialise();
-
-      if (online) {
-        if (clusterManager.isClustering()) {
-          // register the server once it has been created
-          clusterManager.registerServer(server);
+        // initialise prior to registering with clusterManager
+        server.initialise();
+        if (online) {
+          if (clusterManager.isClustering()) {
+            // register the server once it has been created
+            clusterManager.registerServer(server);
+          }
         }
+        // start any services after registering with clusterManager
+        server.start();
       }
-
-      // start any services after registering with clusterManager
-      server.start();
       DbOffline.reset();
       return server;
     }
@@ -244,7 +238,7 @@ public class DefaultContainer implements SpiContainer {
     if (dbPlatform == null) {
       DatabasePlatformFactory factory = new DatabasePlatformFactory();
       DatabasePlatform db = factory.create(config);
-      db.configure(config.getProperties());
+      db.configure(config);
       config.setDatabasePlatform(db);
       logger.info("DatabasePlatform name:" + config.getName() + " platform:" + db.getName());
     }

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

@@ -40,6 +40,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager;
 import com.avaje.ebeaninternal.server.deploy.BeanProperty;
 import com.avaje.ebeaninternal.server.deploy.InheritInfo;
 import com.avaje.ebeaninternal.server.el.ElFilter;
+import com.avaje.ebeaninternal.server.grammer.EqlParser;
 import com.avaje.ebeaninternal.server.lib.ShutdownManager;
 import com.avaje.ebeaninternal.server.query.CQuery;
 import com.avaje.ebeaninternal.server.query.CQueryEngine;
@@ -557,7 +558,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     InheritInfo inheritInfo = desc.getInheritInfo();
     if (inheritInfo == null) {
-      return (T)desc.contextRef(pc, null, id);
+      return (T)desc.contextRef(pc, null, false, id);
     }
 
     BeanProperty idProp = desc.getIdProperty();
@@ -887,6 +888,32 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return createQuery(beanType);
   }
 
+  @Override
+  public <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    BeanDescriptor<T> desc = getBeanDescriptor(beanType);
+    if (desc == null) {
+      throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?");
+    }
+    String named = desc.getNamedQuery(namedQuery);
+    if (named != null) {
+      return createQuery(beanType, named);
+    }
+    RawSql rawSql = desc.getNamedRawSql(namedQuery);
+    if (rawSql != null) {
+      DefaultOrmQuery<T> query = createQuery(beanType);
+      query.setRawSql(rawSql);
+      return query;
+    }
+    throw new PersistenceException("No named query called " + namedQuery + " for bean:" + beanType.getName());
+  }
+
+  @Override
+  public <T> Query<T> createQuery(Class<T> beanType, String eql) {
+    DefaultOrmQuery<T> query = createQuery(beanType);
+    EqlParser.parse(eql, query);
+    return query;
+  }
+
   public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType) {
     BeanDescriptor<T> desc = getBeanDescriptor(beanType);
     if (desc == null) {
@@ -939,12 +966,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
     spiQuery.setType(type);
+    spiQuery.checkNamedParameters();
 
     return createQueryRequest(spiQuery, t);
   }
 
   private <T> SpiOrmQueryRequest<T> createQueryRequest(SpiQuery<T> query, Transaction t) {
 
+    query.setDefaultRawSqlIfRequired();
     if (query.isAutoTunable() && !autoTuneService.tuneQuery(query)) {
       // use deployment FetchType.LAZY/EAGER annotations
       // to define the 'default' select clause

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

@@ -548,7 +548,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Create and return a new reference bean matching this beans Id value.
    */
   public T createReference() {
-    return beanDescriptor.createReference(Boolean.FALSE, getBeanId(), null);
+    return beanDescriptor.createReference(Boolean.FALSE, false, getBeanId(), null);
   }
 
   /**

src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java

@@ -46,9 +46,11 @@ abstract class AssocOneHelp {
       return existing;
     }
 
-    Object ref = target.contextRef(pc, ctx.isReadOnly(), id);
-    EntityBeanIntercept ebi = ((EntityBean) ref)._ebean_getIntercept();
-    ctx.register(property.name, ebi);
+    boolean disableLazyLoading = ctx.isDisableLazyLoading();
+    Object ref = target.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
+    if (!disableLazyLoading) {
+      ctx.register(property.name, ((EntityBean) ref)._ebean_getIntercept());
+    }
     return ref;
   }
 

src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java

@@ -53,9 +53,11 @@ class AssocOneHelpRefInherit extends AssocOneHelp {
     }
 
     // for inheritance hierarchy create the correct type for this row...
-    Object ref = desc.contextRef(pc, ctx.isReadOnly(), id);
-    EntityBeanIntercept ebi = ((EntityBean) ref)._ebean_getIntercept();
-    ctx.register(property.name, ebi);
+    boolean disableLazyLoading = ctx.isDisableLazyLoading();
+    Object ref = desc.contextRef(pc, ctx.isReadOnly(), disableLazyLoading, id);
+    if (disableLazyLoading) {
+      ctx.register(property.name, ((EntityBean) ref)._ebean_getIntercept());
+    }
     return ref;
   }
 

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -7,7 +7,6 @@ import com.avaje.ebean.RawSql;
 import com.avaje.ebean.SqlUpdate;
 import com.avaje.ebean.Transaction;
 import com.avaje.ebean.ValuePair;
-import com.avaje.ebeaninternal.api.ConcurrencyMode;
 import com.avaje.ebean.annotation.DocStoreMode;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.EntityBean;
@@ -16,8 +15,8 @@ import com.avaje.ebean.bean.PersistenceContext;
 import com.avaje.ebean.bean.PersistenceContextUtil;
 import com.avaje.ebean.config.EncryptKey;
 import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
 import com.avaje.ebean.config.dbplatform.IdType;
+import com.avaje.ebean.config.dbplatform.PlatformIdGenerator;
 import com.avaje.ebean.event.BeanFindController;
 import com.avaje.ebean.event.BeanPersistController;
 import com.avaje.ebean.event.BeanPersistListener;
@@ -36,6 +35,7 @@ import com.avaje.ebean.plugin.BeanType;
 import com.avaje.ebean.plugin.ExpressionPath;
 import com.avaje.ebean.plugin.Property;
 import com.avaje.ebeaninternal.api.CQueryPlanKey;
+import com.avaje.ebeaninternal.api.ConcurrencyMode;
 import com.avaje.ebeaninternal.api.LoadContext;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import com.avaje.ebeaninternal.api.SpiQuery;
@@ -109,6 +109,10 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
 
   private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<String, ElComparator<T>>();
 
+  private final Map<String, RawSql> namedRawSql;
+
+  private final Map<String, String> namedQuery;
+
   public void merge(EntityBean bean, EntityBean existing) {
 
     EntityBeanIntercept fromEbi = bean._ebean_getIntercept();
@@ -412,6 +416,8 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
     this.rootBeanType = PersistenceContextUtil.root(beanType);
     this.prototypeEntityBean = createPrototypeEntityBean(beanType);
 
+    this.namedQuery = deploy.getNamedQuery();
+    this.namedRawSql = deploy.getNamedRawSql();
     this.inheritInfo = deploy.getInheritInfo();
 
     this.beanFinder = deploy.getBeanFinder();
@@ -443,7 +449,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
     this.baseTableVersionsBetween = deploy.getBaseTableVersionsBetween();
     this.dependentTables = deploy.getDependentTables();
     this.dbComment = deploy.getDbComment();
-    this.autoTunable = EntityType.ORM.equals(entityType) && (beanFinder == null);
+    this.autoTunable = EntityType.ORM == entityType && (beanFinder == null);
 
     // helper object used to derive lists of properties
     DeployBeanPropertyLists listHelper = new DeployBeanPropertyLists(owner, this, deploy);
@@ -985,6 +991,20 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
     return this;
   }
 
+  /**
+   * Return the named ORM query.
+   */
+  public String getNamedQuery(String name) {
+    return namedQuery.get(name);
+  }
+
+  /**
+   * Return the named RawSql query.
+   */
+  public RawSql getNamedRawSql(String named) {
+    return namedRawSql.get(named);
+  }
+
   /**
    * Return the type of DocStoreMode that should occur for this type of persist request
    * given the transactions requested mode.
@@ -1559,9 +1579,9 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
    * Create a reference bean based on the id.
    */
   @SuppressWarnings("unchecked")
-  public T createReference(Boolean readOnly, Object id, PersistenceContext pc) {
+  public T createReference(Boolean readOnly, boolean disableLazyLoad, Object id, PersistenceContext pc) {
 
-    if (cacheSharableBeans && !Boolean.FALSE.equals(readOnly)) {
+    if (cacheSharableBeans && !disableLazyLoad && !Boolean.FALSE.equals(readOnly)) {
       CachedBeanData d = cacheHelp.beanCacheGetData(id);
       if (d != null) {
         Object shareableBean = d.getSharableBean();
@@ -1578,7 +1598,11 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
       id = convertSetId(id, eb);
 
       EntityBeanIntercept ebi = eb._ebean_getIntercept();
-      ebi.setBeanLoader(ebeanServer);
+      if (disableLazyLoad) {
+        ebi.setDisableLazyLoad(true);
+      } else {
+        ebi.setBeanLoader(ebeanServer);
+      }
       ebi.setReference(idPropertyIndex);
       if (Boolean.TRUE == readOnly) {
         ebi.setReadOnly(true);
@@ -1750,8 +1774,8 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Create a reference bean and put it in the persistence context (and return it).
    */
-  public Object contextRef(PersistenceContext pc, Boolean readOnly, Object id) {
-    return createReference(readOnly, id, pc);
+  public Object contextRef(PersistenceContext pc, Boolean readOnly, boolean disableLazyLoad, Object id) {
+    return createReference(readOnly, disableLazyLoad, id, pc);
   }
 
   /**
@@ -2169,7 +2193,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
    * Return true if this is an embedded bean.
    */
   public boolean isEmbedded() {
-    return EntityType.EMBEDDED.equals(entityType);
+    return EntityType.EMBEDDED == entityType;
   }
 
   /**
@@ -2295,15 +2319,10 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   }
 
   /**
-   * Returns true if this bean is based on a table (or possibly view) and
-   * returns false if this bean is based on a raw sql select statement.
-   * <p>
-   * When false querying this bean is based on a supplied sql select statement
-   * placed in the orm xml file (as opposed to Ebean generated sql).
-   * </p>
+   * Returns true if this bean is based on RawSql.
    */
-  public boolean isSqlSelectBased() {
-    return EntityType.SQL.equals(entityType);
+  public boolean isRawSqlBased() {
+    return EntityType.SQL == entityType;
   }
 
   /**

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java

@@ -266,7 +266,7 @@ final class BeanDescriptorCacheHelp<T> {
     bc.checkEmptyLazyLoad();
     for (int i = 0; i < idList.size(); i++) {
       Object id = idList.get(i);
-      Object refBean = targetDescriptor.createReference(readOnly, id, persistenceContext);
+      Object refBean = targetDescriptor.createReference(readOnly, false, id, persistenceContext);
       many.add(bc, (EntityBean) refBean);
     }
     return true;

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.deploy;
 
 import com.avaje.ebean.BackgroundExecutor;
 import com.avaje.ebean.Model;
+import com.avaje.ebean.RawSqlBuilder;
 import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.cache.ServerCacheManager;
@@ -22,10 +23,10 @@ import com.avaje.ebean.plugin.BeanType;
 import com.avaje.ebeaninternal.api.ConcurrencyMode;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import com.avaje.ebeaninternal.api.TransactionEventTable;
-import com.avaje.ebeaninternal.server.core.bootup.BootupClasses;
 import com.avaje.ebeaninternal.server.core.InternString;
 import com.avaje.ebeaninternal.server.core.InternalConfiguration;
 import com.avaje.ebeaninternal.server.core.Message;
+import com.avaje.ebeaninternal.server.core.bootup.BootupClasses;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import com.avaje.ebeaninternal.server.deploy.id.IdBinder;
 import com.avaje.ebeaninternal.server.deploy.id.IdBinderEmbedded;
@@ -47,6 +48,13 @@ import com.avaje.ebeaninternal.server.properties.BeanPropertiesReader;
 import com.avaje.ebeaninternal.server.properties.BeanPropertyInfo;
 import com.avaje.ebeaninternal.server.properties.BeanPropertyInfoFactory;
 import com.avaje.ebeaninternal.server.properties.EnhanceBeanPropertyInfoFactory;
+import com.avaje.ebeaninternal.xmlmapping.XmlMappingReader;
+import com.avaje.ebeaninternal.xmlmapping.model.XmAliasMapping;
+import com.avaje.ebeaninternal.xmlmapping.model.XmColumnMapping;
+import com.avaje.ebeaninternal.xmlmapping.model.XmEbean;
+import com.avaje.ebeaninternal.xmlmapping.model.XmEntity;
+import com.avaje.ebeaninternal.xmlmapping.model.XmNamedQuery;
+import com.avaje.ebeaninternal.xmlmapping.model.XmRawSql;
 import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import com.avaje.ebeanservice.docstore.api.DocStoreFactory;
 import org.slf4j.Logger;
@@ -56,12 +64,16 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -124,7 +136,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final String serverName;
 
-  private Map<Class<?>, DeployBeanInfo<?>> deplyInfoMap = new HashMap<Class<?>, DeployBeanInfo<?>>();
+  private Map<Class<?>, DeployBeanInfo<?>> deployInfoMap = new HashMap<Class<?>, DeployBeanInfo<?>>();
 
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<Class<?>, BeanTable>();
 
@@ -301,6 +313,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     try {
       createListeners();
       readEntityDeploymentInitial();
+      readXmlMapping();
       readEmbeddedDeployment();
       readEntityBeanTable();
       readEntityDeploymentAssociations();
@@ -319,8 +332,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       logStatus();
 
-      deplyInfoMap.clear();
-      deplyInfoMap = null;
+      deployInfoMap.clear();
+      deployInfoMap = null;
 
       return asOfTableMap;
 
@@ -330,6 +343,66 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
+  private void readXmlMapping() {
+
+    try {
+      ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
+
+      Enumeration<URL> resources = classLoader.getResources("ebean.xml");
+
+      List<XmEbean> mappings = new ArrayList<XmEbean>();
+      while (resources.hasMoreElements()) {
+        URL url = resources.nextElement();
+        InputStream is = url.openStream();
+        mappings.add(XmlMappingReader.read(is));
+        is.close();
+      }
+
+      for (XmEbean mapping : mappings) {
+        List<XmEntity> entityDeploy = mapping.getEntity();
+        for (XmEntity deploy : entityDeploy) {
+          readEntityMapping(classLoader, deploy);
+        }
+      }
+
+    } catch (IOException e) {
+      throw new RuntimeException("Error reading ebean.xml", e);
+    }
+  }
+
+  private void readEntityMapping(ClassLoader classLoader, XmEntity entityDeploy) {
+
+    String entityClassName = entityDeploy.getClazz();
+    Class<?> entityClass;
+    try {
+      entityClass = Class.forName(entityClassName, false, classLoader);
+    } catch (Exception e) {
+      logger.error("Could not load entity bean class "+entityClassName+" for ebean.xml entry");
+      return;
+    }
+
+    DeployBeanInfo<?> info = deployInfoMap.get(entityClass);
+    if (info == null) {
+      logger.error("No entity bean for ebean.xml entry "+entityClassName);
+
+    } else {
+      for (XmRawSql sql : entityDeploy.getRawSql()) {
+        RawSqlBuilder builder = RawSqlBuilder.parse(sql.getQuery().getValue());
+        for (XmColumnMapping columnMapping : sql.getColumnMapping()) {
+          builder.columnMapping(columnMapping.getColumn(), columnMapping.getProperty());
+        }
+        for (XmAliasMapping aliasMapping : sql.getAliasMapping()) {
+          builder.tableAliasMapping(aliasMapping.getAlias(), aliasMapping.getProperty());
+        }
+        info.addRawSql(sql.getName(), builder.create());
+      }
+
+      for (XmNamedQuery namedQuery : entityDeploy.getNamedQuery()) {
+        info.addNamedQuery(namedQuery.getName(), namedQuery.getQuery().getValue());
+      }
+    }
+  }
+
   /**
    * Return the Encrypt key given the table and column name.
    */
@@ -381,7 +454,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     for (String depTable : viewInvalidation) {
       List<BeanDescriptor<?>> list = tableToViewDescMap.get(depTable.toLowerCase());
-      if (list == null) {
+      if (list != null) {
         for (int i = 0; i < list.size(); i++) {
           list.get(i).queryCacheClear();
         }
@@ -569,7 +642,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Return the bean deploy info for the given class.
    */
   public <T> DeployBeanInfo<T> getDeploy(Class<T> cls) {
-    return (DeployBeanInfo<T>) deplyInfoMap.get(cls);
+    return (DeployBeanInfo<T>) deployInfoMap.get(cls);
   }
 
   private void registerBeanDescriptor(BeanDescriptor<?> desc) {
@@ -601,12 +674,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     for (Class<?> entityClass : bootupClasses.getEntities()) {
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
-      deplyInfoMap.put(entityClass, info);
+      deployInfoMap.put(entityClass, info);
     }
     for (Class<?> entityClass : bootupClasses.getEmbeddables()) {
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
       readDeployAssociations(info);
-      deplyInfoMap.put(entityClass, info);
+      deployInfoMap.put(entityClass, info);
     }
   }
 
@@ -618,7 +691,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private void readEntityBeanTable() {
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       BeanTable beanTable = createBeanTable(info);
       beanTableMap.put(beanTable.getBeanType(), beanTable);
     }
@@ -632,18 +705,18 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private void readEntityDeploymentAssociations() {
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       readDeployAssociations(info);
     }
   }
 
   private void readInheritedIdGenerators() {
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       DeployBeanDescriptor<?> descriptor = info.getDescriptor();
       InheritInfo inheritInfo = descriptor.getInheritInfo();
       if (inheritInfo != null && !inheritInfo.isRoot()) {
-        DeployBeanInfo<?> rootBeanInfo = deplyInfoMap.get(inheritInfo.getRoot().getType());
+        DeployBeanInfo<?> rootBeanInfo = deployInfoMap.get(inheritInfo.getRoot().getType());
         PlatformIdGenerator rootIdGen = rootBeanInfo.getDescriptor().getIdGenerator();
         if (rootIdGen != null) {
           descriptor.setIdGenerator(rootIdGen);
@@ -668,20 +741,20 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     // We only perform 'circular' checks etc after we have
     // all the DeployBeanDescriptors created and in the map.
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       checkMappedBy(info);
     }
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       secondaryPropsJoins(info);
     }
 
     // Set inheritance info
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       setInheritanceInfo(info);
     }
 
-    for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
+    for (DeployBeanInfo<?> info : deployInfoMap.values()) {
       registerBeanDescriptor(new BeanDescriptor(this, info.getDescriptor()));
     }
   }
@@ -695,7 +768,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     for (DeployBeanPropertyAssocOne<?> oneProp : info.getDescriptor().propertiesAssocOne()) {
       if (!oneProp.isTransient()) {
-        DeployBeanInfo<?> assoc = deplyInfoMap.get(oneProp.getTargetType());
+        DeployBeanInfo<?> assoc = deployInfoMap.get(oneProp.getTargetType());
         if (assoc != null) {
           oneProp.getTableJoin().setInheritInfo(assoc.getDescriptor().getInheritInfo());
         }
@@ -704,7 +777,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     for (DeployBeanPropertyAssocMany<?> manyProp : info.getDescriptor().propertiesAssocMany()) {
       if (!manyProp.isTransient()) {
-        DeployBeanInfo<?> assoc = deplyInfoMap.get(manyProp.getTargetType());
+        DeployBeanInfo<?> assoc = deployInfoMap.get(manyProp.getTargetType());
         if (assoc != null) {
           manyProp.getTableJoin().setInheritInfo(assoc.getDescriptor().getInheritInfo());
         }
@@ -763,7 +836,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private DeployBeanDescriptor<?> getTargetDescriptor(DeployBeanPropertyAssoc<?> prop) {
 
     Class<?> targetType = prop.getTargetType();
-    DeployBeanInfo<?> info = deplyInfoMap.get(targetType);
+    DeployBeanInfo<?> info = deployInfoMap.get(targetType);
     if (info == null) {
       String msg = "Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName();
       throw new PersistenceException(msg);

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java

@@ -27,6 +27,7 @@ import com.avaje.ebeaninternal.server.type.DataBind;
 import com.avaje.ebeaninternal.server.type.ScalarType;
 import com.avaje.ebeaninternal.server.type.ScalarTypeBoolean;
 import com.avaje.ebeaninternal.server.type.ScalarTypeEnum;
+import com.avaje.ebeaninternal.server.type.ScalarTypeLogicalType;
 import com.avaje.ebeaninternal.util.ValueUtil;
 import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping;
@@ -413,7 +414,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     this.generatedProperty = source.getGeneratedProperty();
     this.getter = source.getter;
     this.setter = source.setter;
-    this.dbType = source.getDbType();
+    this.dbType = source.getDbType(true);
     this.scalarType = source.scalarType;
     this.lob = isLobType(dbType);
     this.propertyType = source.getPropertyType();
@@ -1087,9 +1088,14 @@ public class BeanProperty implements ElPropertyValue, Property {
 
   /**
    * Return the database jdbc data type this is mapped to.
+   *
+   * @param platformTypes Set as false when we want logical platform agnostic types.
    */
-  public int getDbType() {
-    return dbType;
+  public int getDbType(boolean platformTypes) {
+    if (platformTypes || !(scalarType instanceof ScalarTypeLogicalType)) {
+      return dbType;
+    }
+    return ((ScalarTypeLogicalType)scalarType).getLogicalType();
   }
 
   /**
@@ -1167,6 +1173,13 @@ public class BeanProperty implements ElPropertyValue, Property {
     return excludedFromHistory;
   }
 
+  /**
+   * Return true if this is a ManyToMany with history support (on the intersection table).
+   */
+  public boolean isManyToManyWithHistory() {
+    return !excludedFromHistory && descriptor.isHistorySupport();
+  }
+
   /**
    * Return true if this property only exists on the draft table.
    */

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java

@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Abstract base for properties mapped to an associated bean, list, set or map.
@@ -41,6 +42,11 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
 
   String targetIdProperty;
 
+  /**
+   * Derived list of exported property and matching foreignKey
+   */
+  protected ExportedProperty[] exportedProperties;
+
   /**
    * Persist settings.
    */
@@ -322,7 +328,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
     BeanProperty idProp = target.getIdProperty();
     BeanProperty[] others = target.propertiesBaseScalar();
 
-    if (descriptor.isSqlSelectBased()) {
+    if (descriptor.isRawSqlBased()) {
       String dbColumn = owner.getDbColumn();
       return new ImportedIdSimple(owner, dbColumn, idProp, 0);
     }
@@ -385,4 +391,18 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
         + " Perhaps an error in a @JoinColumn";
     throw new PersistenceException(msg);
   }
+
+  protected void bindWhereParentId(List<Object> bindValues, Object parentId) {
+
+    if (exportedProperties.length == 1) {
+      bindValues.add(parentId);
+
+    } else {
+      EntityBean parent = (EntityBean) parentId;
+      for (int i = 0; i < exportedProperties.length; i++) {
+        Object embVal = exportedProperties[i].getValue(parent);
+        bindValues.add(embVal);
+      }
+    }
+  }
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -85,11 +85,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
 
   private BeanProperty mapKeyProperty;
 
-  /**
-   * Derived list of exported property and matching foreignKey
-   */
-  private ExportedProperty[] exportedProperties;
-
   private String exportedPropertyBindProto = "?";
 
   /**
@@ -299,23 +294,25 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   /**
    * Find the Id's of detail beans given a parent Id or list of parent Id's.
    */
-  public List<Object> findIdsByParentId(Object parentId, List<Object> parentIdist, Transaction t, ArrayList<Object> excludeDetailIds) {
+  public List<Object> findIdsByParentId(Object parentId, List<Object> parentIdList, Transaction t, ArrayList<Object> excludeDetailIds) {
     if (parentId != null) {
       return findIdsByParentId(parentId, t, excludeDetailIds);
     } else {
-      return findIdsByParentIdList(parentIdist, t, excludeDetailIds);
+      return findIdsByParentIdList(parentIdList, t, excludeDetailIds);
     }
   }
 
   private List<Object> findIdsByParentId(Object parentId, Transaction t, ArrayList<Object> excludeDetailIds) {
 
     String rawWhere = deriveWhereParentIdSql(false, "");
+    List<Object> bindValues = new ArrayList<Object>();
+    bindWhereParentId(bindValues, parentId);
 
     EbeanServer server = getBeanDescriptor().getEbeanServer();
     Query<?> q = server.find(getPropertyType())
-        .where().raw(rawWhere).query();
-
-    bindWhereParendId(1, q, parentId);
+        .where()
+        .raw(rawWhere, bindValues.toArray())
+        .query();
 
     if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
       Expression idIn = q.getExpressionFactory().idIn(excludeDetailIds);
@@ -371,21 +368,24 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     query.where().raw(expr, bindValues.toArray());
   }
 
-  private List<Object> findIdsByParentIdList(List<Object> parentIdist, Transaction t, ArrayList<Object> excludeDetailIds) {
+  private List<Object> findIdsByParentIdList(List<Object> parentIdList, Transaction t, ArrayList<Object> excludeDetailIds) {
 
     String rawWhere = deriveWhereParentIdSql(true, "");
-    String inClause = buildInClauseBinding(parentIdist.size(), exportedPropertyBindProto);
+    String inClause = buildInClauseBinding(parentIdList.size(), exportedPropertyBindProto);
 
     String expr = rawWhere + inClause;
 
-    EbeanServer server = getBeanDescriptor().getEbeanServer();
-    Query<?> q = server.find(getPropertyType()).where().raw(expr).query();
-
-    int pos = 1;
-    for (int i = 0; i < parentIdist.size(); i++) {
-      pos = bindWhereParendId(pos, q, parentIdist.get(i));
+    List<Object> bindValues = new ArrayList<Object>();
+    for (int i = 0; i < parentIdList.size(); i++) {
+      bindWhereParentId(bindValues, parentIdList.get(i));
     }
 
+    EbeanServer server = getBeanDescriptor().getEbeanServer();
+    Query<?> q = server.find(getPropertyType())
+        .where()
+        .raw(expr, bindValues.toArray())
+        .query();
+
     if (excludeDetailIds != null && !excludeDetailIds.isEmpty()) {
       Expression idIn = q.getExpressionFactory().idIn(excludeDetailIds);
       q.where().not(idIn);
@@ -690,22 +690,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     }
   }
 
-  private int bindWhereParendId(int pos, Query<?> q, Object parentId) {
-
-    if (exportedProperties.length == 1) {
-      q.setParameter(pos++, parentId);
-
-    } else {
-
-      EntityBean parent = (EntityBean) parentId;
-      for (int i = 0; i < exportedProperties.length; i++) {
-        Object embVal = exportedProperties[i].getValue(parent);
-        q.setParameter(pos++, embVal);
-      }
-    }
-    return pos;
-  }
-
   public void addSelectExported(DbSqlContext ctx, String tableAlias) {
 
     String alias = manyToMany ? "int_" : tableAlias;
@@ -1028,7 +1012,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       if (isManyToMany()) {
         if (liveBean == null) {
           // add new relationship (Map not allowed here)
-          liveVal.addBean(targetDescriptor.createReference(Boolean.FALSE, id, null));
+          liveVal.addBean(targetDescriptor.createReference(Boolean.FALSE, false, id, null));
         }
 
       } else {

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -50,8 +50,6 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
    */
   protected ImportedId importedId;
 
-  private ExportedProperty[] exportedProperties;
-
   private String deleteByParentIdSql;
   private String deleteByParentIdInSql;
 
@@ -240,47 +238,37 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
     String rawWhere = deriveWhereParentIdSql(false);
 
+    List<Object> bindValues = new ArrayList<Object>();
+    bindWhereParentId(bindValues, parentId);
+
     EbeanServer server = getBeanDescriptor().getEbeanServer();
     Query<?> q = server.find(getPropertyType())
-        .where().raw(rawWhere).query();
+        .where()
+        .raw(rawWhere, bindValues.toArray())
+        .query();
 
-    bindWhereParendId(q, parentId);
     return server.findIds(q, t);
   }
 
-  private List<Object> findIdsByParentIdList(List<Object> parentIdist, Transaction t) {
+  private List<Object> findIdsByParentIdList(List<Object> parentIdList, Transaction t) {
 
     String rawWhere = deriveWhereParentIdSql(true);
-    String inClause = targetIdBinder.getIdInValueExpr(parentIdist.size());
+    String inClause = targetIdBinder.getIdInValueExpr(parentIdList.size());
 
     String expr = rawWhere + inClause;
 
+    List<Object> bindValues = new ArrayList<Object>();
+    for (int i = 0; i < parentIdList.size(); i++) {
+      bindWhereParentId(bindValues, parentIdList.get(i));
+    }
+
     EbeanServer server = getBeanDescriptor().getEbeanServer();
     Query<?> q = (Query<?>) server.find(getPropertyType())
-        .where().raw(expr);
-
-    for (int i = 0; i < parentIdist.size(); i++) {
-      bindWhereParendId(q, parentIdist.get(i));
-    }
+        .where().raw(expr, bindValues.toArray());
 
     return server.findIds(q, t);
   }
 
-  private void bindWhereParendId(Query<?> q, Object parentId) {
-
-    if (exportedProperties.length == 1) {
-      q.setParameter(1, parentId);
-
-    } else {
-      int pos = 1;
-      EntityBean parent = (EntityBean) parentId;
-      for (int i = 0; i < exportedProperties.length; i++) {
-        Object embVal = exportedProperties[i].getValue(parent);
-        q.setParameter(pos++, embVal);
-      }
-    }
-  }
-
   void addFkey() {
     if (importedId != null) {
       importedId.addFkeys(name);
@@ -422,7 +410,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
         // cacheData is the id value, maybe already in persistence context
         Object assocBean = targetDescriptor.contextGet(context, cacheData);
         if (assocBean == null) {
-          assocBean = targetDescriptor.createReference(Boolean.FALSE, cacheData, context);
+          assocBean = targetDescriptor.createReference(Boolean.FALSE, false, cacheData, context);
         }
         setValue(bean, assocBean);
       }

src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java

@@ -84,4 +84,9 @@ public interface DbReadContext {
    * Return true if the underlying query is a 'asDraft' query.
    */
   boolean isDraftQuery();
+
+  /**
+   * Return true if this request disables lazy loading.
+   */
+  boolean isDisableLazyLoading();
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java

@@ -51,14 +51,14 @@ public abstract class DeployParser {
 	 */
 	public abstract Set<String> getIncludes();
 
-    public void setEncrypted(boolean encrytped) {
-        this.encrypted = encrytped;
-    }
+	public void setEncrypted(boolean encrypted) {
+		this.encrypted = encrypted;
+	}
 
 	public String parse(String source) {
 
 		if (source == null) {
-			return source;
+			return null;
 		}
 		
 		pos = -1;

src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java

@@ -144,15 +144,13 @@ public class ImportedIdEmbedded implements ImportedId {
    */
   public BeanProperty findMatchImport(String matchDbColumn) {
 
-    BeanProperty p = null;
     for (int i = 0; i < imported.length; i++) {
-      p = imported[i].findMatchImport(matchDbColumn);
+      BeanProperty p = imported[i].findMatchImport(matchDbColumn);
       if (p != null) {
         return p;
       }
     }
-
-    return p;
+    return null;
   }
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -1,5 +1,6 @@
 package com.avaje.ebeaninternal.server.deploy.meta;
 
+import com.avaje.ebean.RawSql;
 import com.avaje.ebean.annotation.Cache;
 import com.avaje.ebean.annotation.DocStore;
 import com.avaje.ebean.annotation.DocStoreMode;
@@ -35,14 +36,20 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Describes Beans including their deployment information.
  */
 public class DeployBeanDescriptor<T> {
 
+  private static final Map<String, String> EMPTY_NAMED_QUERY = new HashMap<String, String>();
+
+  private static final Map<String, RawSql> EMPTY_RAW_MAP = new HashMap<String, RawSql>();
+
   private static class PropOrder implements Comparator<DeployBeanProperty> {
 
     public int compare(DeployBeanProperty o1, DeployBeanProperty o2) {
@@ -66,6 +73,10 @@ public class DeployBeanDescriptor<T> {
    */
   private LinkedHashMap<String, DeployBeanProperty> propMap = new LinkedHashMap<String, DeployBeanProperty>();
 
+  private Map<String, RawSql> namedRawSql;
+
+  private Map<String, String> namedQuery;
+
   private EntityType entityType;
 
   private DeployBeanPropertyAssocOne<?> unidirectional;
@@ -561,7 +572,7 @@ public class DeployBeanDescriptor<T> {
    * Return the base table with as of suffix.
    */
   public String getBaseTableAsOf() {
-    return baseTableAsOf;
+    return historySupport ? baseTableAsOf : baseTable;
   }
 
   /**
@@ -1047,4 +1058,38 @@ public class DeployBeanDescriptor<T> {
     if (docStorePersist != DocStoreMode.DEFAULT) return docStorePersist;
     return serverConfig.getDocStoreConfig().getPersist();
   }
+
+  /**
+   * Return the named ORM queries.
+   */
+  public Map<String, String> getNamedQuery() {
+    return (namedQuery != null) ? namedQuery : EMPTY_NAMED_QUERY;
+  }
+
+  /**
+   * Add a named query.
+   */
+  public void addNamedQuery(String name, String query) {
+    if (namedQuery == null) {
+      namedQuery = new LinkedHashMap<String, String>();
+    }
+    namedQuery.put(name, query);
+  }
+
+  /**
+   * Return the named RawSql queries.
+   */
+  public Map<String, RawSql> getNamedRawSql() {
+    return (namedRawSql != null) ? namedRawSql : EMPTY_RAW_MAP;
+  }
+
+  /**
+   * Add a named RawSql from ebean.xml file.
+   */
+  public void addRawSql(String name, RawSql rawSql) {
+    if (namedRawSql == null) {
+      namedRawSql = new HashMap<String, RawSql>();
+    }
+    namedRawSql.put(name, rawSql);
+  }
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -21,6 +21,8 @@ import javax.persistence.AttributeOverride;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
@@ -68,13 +70,11 @@ public class AnnotationClass extends AnnotationParser {
     if (override != null) {
       String propertyName = override.name();
       Column column = override.column();
-      if (column != null) {
-        DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName);
-        if (beanProperty == null) {
-          logger.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
-        } else {
-          readColumn(column, beanProperty);
-        }
+      DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName);
+      if (beanProperty == null) {
+        logger.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
+      } else {
+        readColumn(column, beanProperty);
       }
     }
   }
@@ -179,6 +179,18 @@ public class AnnotationClass extends AnnotationParser {
     if (cache != null && !disableL2Cache) {
       descriptor.setCache(cache);
     }
+
+    NamedQueries namedQueries = cls.getAnnotation(NamedQueries.class);
+    if (namedQueries != null) {
+      for (NamedQuery namedQuery : namedQueries.value()) {
+        descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
+      }
+    }
+
+    NamedQuery namedQuery = cls.getAnnotation(NamedQuery.class);
+    if (namedQuery != null) {
+      descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
+    }
   }
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java

@@ -1,12 +1,13 @@
 package com.avaje.ebeaninternal.server.deploy.parse;
 
-import java.util.HashMap;
-
+import com.avaje.ebean.RawSql;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import com.avaje.ebeaninternal.server.query.SqlJoinType;
 
+import java.util.HashMap;
+
 /**
  * Wraps information about a bean during deployment parsing.
  */
@@ -75,4 +76,17 @@ public class DeployBeanInfo<T> {
 		tableJoin.setType(outerJoin ? SqlJoinType.OUTER : SqlJoinType.INNER);
 	}
 
+  /**
+   * Add named RawSql from ebean.xml.
+   */
+	public void addRawSql(String name, RawSql rawSql) {
+		descriptor.addRawSql(name, rawSql);
+	}
+
+	/**
+	 * Add the named query.
+   */
+	public void addNamedQuery(String name, String query) {
+		descriptor.addNamedQuery(name, query);
+	}
 }

src/main/java/com/avaje/ebeaninternal/server/expression/AbstractExpression.java

@@ -21,6 +21,11 @@ public abstract class AbstractExpression implements SpiExpression {
     this.propName = propName;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public Object getIdEqualTo(String idName) {
     // override on SimpleExpression

src/main/java/com/avaje/ebeaninternal/server/expression/AbstractValueExpression.java

@@ -0,0 +1,32 @@
+package com.avaje.ebeaninternal.server.expression;
+
+/**
+ * Abstract expression that helps with named parameter use.
+ */
+public abstract class AbstractValueExpression extends AbstractExpression {
+
+  protected final Object bindValue;
+
+  /**
+   * Construct with property name and potential named parameter.
+   */
+  protected AbstractValueExpression(String propName, Object bindValue) {
+    super(propName);
+    this.bindValue = bindValue;
+  }
+
+  /**
+   * Return the bind value taking into account named parameters.
+   */
+  protected Object value() {
+    return NamedParamHelp.value(bindValue);
+  }
+
+  /**
+   * Return the String bind value taking into account named parameters.
+   */
+  protected String strValue() {
+    return NamedParamHelp.valueAsString(bindValue);
+  }
+
+}

src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java

@@ -14,21 +14,29 @@ class BetweenExpression extends AbstractExpression {
 
   private final Object valueLow;
 
-  BetweenExpression(String propertyName, Object valLo, Object valHigh) {
+  BetweenExpression(String propertyName, Object valueLow, Object valueHigh) {
     super(propertyName);
-    this.valueLow = valLo;
-    this.valueHigh = valHigh;
+    this.valueLow = valueLow;
+    this.valueHigh = valueHigh;
+  }
+
+  private Object low() {
+    return NamedParamHelp.value(valueLow);
+  }
+
+  private Object high() {
+    return NamedParamHelp.value(valueHigh);
   }
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeRange(propName, Op.GT_EQ, valueLow, Op.LT_EQ, valueHigh);
+    context.writeRange(propName, Op.GT_EQ, low(), Op.LT_EQ, high());
   }
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-    request.addBindValue(valueLow);
-    request.addBindValue(valueHigh);
+    request.addBindValue(low());
+    request.addBindValue(high());
   }
 
   @Override
@@ -45,8 +53,8 @@ class BetweenExpression extends AbstractExpression {
 
   @Override
   public int queryBindHash() {
-    int hc = valueLow.hashCode();
-    hc = hc * 31 + valueHigh.hashCode();
+    int hc = low().hashCode();
+    hc = hc * 31 + high().hashCode();
     return hc;
   }
 
@@ -63,7 +71,7 @@ class BetweenExpression extends AbstractExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     BetweenExpression that = (BetweenExpression) other;
-    return valueLow.equals(that.valueLow)
-        && valueHigh.equals(that.valueHigh);
+    return low().equals(that.low())
+        && high().equals(that.high());
   }
 }

src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java

@@ -32,11 +32,15 @@ class BetweenPropertyExpression extends NonPrepareExpression {
     return propName;
   }
 
+  private Object val() {
+    return NamedParamHelp.value(value);
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.startBoolMust();
-    context.writeSimple(Op.LT_EQ, lowProperty, value);
-    context.writeSimple(Op.GT_EQ, highProperty, value);
+    context.writeSimple(Op.LT_EQ, lowProperty, val());
+    context.writeSimple(Op.GT_EQ, highProperty, val());
     context.endBool();
   }
 
@@ -72,7 +76,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-    request.addBindValue(value);
+    request.addBindValue(val());
   }
 
   @Override
@@ -89,7 +93,7 @@ class BetweenPropertyExpression extends NonPrepareExpression {
 
   @Override
   public int queryBindHash() {
-    return value.hashCode();
+    return val().hashCode();
   }
 
   @Override
@@ -106,6 +110,6 @@ class BetweenPropertyExpression extends NonPrepareExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     BetweenPropertyExpression that = (BetweenPropertyExpression) other;
-    return value.equals(that.value);
+    return val().equals(that.val());
   }
 }

src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java

@@ -7,18 +7,22 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-class CaseInsensitiveEqualExpression extends AbstractExpression {
+class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
-  private final String value;
+  CaseInsensitiveEqualExpression(String propertyName, Object value) {
+    super(propertyName, value);
+  }
 
-  CaseInsensitiveEqualExpression(String propertyName, String value) {
-    super(propertyName);
-    this.value = value.toLowerCase();
+  /**
+   * Return the bind value taking into account named parameters.
+   */
+  private String val() {
+    return strValue().toLowerCase();
   }
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIEqualTo(propName, value);
+    context.writeIEqualTo(propName, val());
   }
 
   @Override
@@ -31,7 +35,7 @@ class CaseInsensitiveEqualExpression extends AbstractExpression {
       request.addBindEncryptKey(encryptKey);
     }
 
-    request.addBindValue(value);
+    request.addBindValue(val());
   }
 
   @Override
@@ -54,7 +58,7 @@ class CaseInsensitiveEqualExpression extends AbstractExpression {
 
   @Override
   public int queryBindHash() {
-    return value.hashCode();
+    return val().hashCode();
   }
 
   @Override
@@ -70,6 +74,6 @@ class CaseInsensitiveEqualExpression extends AbstractExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     CaseInsensitiveEqualExpression that = (CaseInsensitiveEqualExpression) other;
-    return value.equals(that.value);
+    return val().equals(that.val());
   }
 }

src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java

@@ -88,6 +88,11 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
     }
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     if (!list.isEmpty()) {

src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java

@@ -157,6 +157,13 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new CaseInsensitiveEqualExpression(propertyName, value);
   }
 
+  /**
+   * Create for named parameter use (and without support for equalsWithNullAsNoop).
+   */
+  public Expression ieqObject(String propertyName, Object value) {
+    return new CaseInsensitiveEqualExpression(propertyName, value);
+  }
+
   /**
    * Between - property between the two given values.
    */
@@ -251,6 +258,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new DefaultExampleExpression(checkEntityBean(example), caseInsensitive, likeType);
   }
 
+  @Override
+  public Expression like(String propertyName, Object value, boolean caseInsensitive, LikeType likeType) {
+    return new LikeExpression(propertyName, value, caseInsensitive, likeType);
+  }
+
   /**
    * Like - property like value where the value contains the SQL wild card
    * characters % (percentage) and _ (underscore).

src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -97,6 +97,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     }
   }
 
+  void simplifyEntries() {
+    for (SpiExpression element : list) {
+      element.simplify();
+    }
+  }
+
+  public void simplify() {
+    simplifyEntries();
+  }
+
   /**
    * Write being aware if it is the Top level "text" expressions.
    * <p>

src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java

@@ -36,6 +36,11 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
     this.subQuery = null;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     throw new IllegalStateException("Not supported");

src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java

@@ -1,35 +1,54 @@
 package com.avaje.ebeaninternal.server.expression;
 
 import com.avaje.ebean.bean.EntityBean;
+import com.avaje.ebean.event.BeanQueryRequest;
 import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
 import com.avaje.ebeaninternal.api.SpiExpression;
 import com.avaje.ebeaninternal.api.SpiExpressionRequest;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 class InExpression extends AbstractExpression {
 
   private final boolean not;
 
-  private final Object[] values;
+  private final Collection<?> sourceValues;
 
-  InExpression(String propertyName, Collection<?> coll, boolean not) {
+  private Object[] bindValues;
+
+  InExpression(String propertyName, Collection<?> sourceValues, boolean not) {
     super(propertyName);
-    this.values = coll.toArray(new Object[coll.size()]);
+    this.sourceValues = sourceValues;
     this.not = not;
   }
 
   InExpression(String propertyName, Object[] array, boolean not) {
     super(propertyName);
-    this.values = array;
+    this.sourceValues = Arrays.asList(array);
     this.not = not;
   }
 
+  private Object[] values() {
+    List<Object> vals = new ArrayList<Object>();
+    for (Object sourceValue : sourceValues) {
+      NamedParamHelp.valueAdd(vals, sourceValue);
+    }
+    return vals.toArray();
+  }
+
+  @Override
+  public void prepareExpression(BeanQueryRequest<?> request) {
+    bindValues = values();
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIn(propName, values, not);
+    context.writeIn(propName, values(), not);
   }
 
   @Override
@@ -40,13 +59,13 @@ class InExpression extends AbstractExpression {
       prop = null;
     }
 
-    for (int i = 0; i < values.length; i++) {
+    for (int i = 0; i < bindValues.length; i++) {
       if (prop == null) {
-        request.addBindValue(values[i]);
+        request.addBindValue(bindValues[i]);
 
       } else {
         // extract the id values from the bean
-        Object[] ids = prop.getAssocIdValues((EntityBean) values[i]);
+        Object[] ids = prop.getAssocIdValues((EntityBean) bindValues[i]);
         if (ids != null) {
           for (int j = 0; j < ids.length; j++) {
             request.addBindValue(ids[j]);
@@ -59,7 +78,7 @@ class InExpression extends AbstractExpression {
   @Override
   public void addSql(SpiExpressionRequest request) {
 
-    if (values.length == 0) {
+    if (bindValues.length == 0) {
       String expr = not ? "1=1" : "1=0";
       request.append(expr);
       return;
@@ -72,7 +91,7 @@ class InExpression extends AbstractExpression {
 
     if (prop != null) {
       request.append(prop.getAssocIdInExpr(propName));
-      String inClause = prop.getAssocIdInValueExpr(values.length);
+      String inClause = prop.getAssocIdInValueExpr(bindValues.length);
       request.append(inClause);
 
     } else {
@@ -81,7 +100,7 @@ class InExpression extends AbstractExpression {
         request.append(" not");
       }
       request.append(" in (?");
-      for (int i = 1; i < values.length; i++) {
+      for (int i = 1; i < bindValues.length; i++) {
         request.append(", ").append("?");
       }
 
@@ -94,15 +113,15 @@ class InExpression extends AbstractExpression {
    */
   @Override
   public void queryPlanHash(HashQueryPlanBuilder builder) {
-    builder.add(InExpression.class).add(propName).add(values.length).add(not);
-    builder.bind(values.length);
+    builder.add(InExpression.class).add(propName).add(bindValues.length).add(not);
+    builder.bind(bindValues.length);
   }
 
   @Override
   public int queryBindHash() {
     int hc = 31;
-    for (int i = 0; i < values.length; i++) {
-      hc = 31 * hc + values[i].hashCode();
+    for (int i = 0; i < bindValues.length; i++) {
+      hc = 31 * hc + bindValues[i].hashCode();
     }
     return hc;
   }
@@ -116,17 +135,17 @@ class InExpression extends AbstractExpression {
     InExpression that = (InExpression) other;
     return propName.equals(that.propName)
         && not == that.not
-        && values.length == that.values.length;
+        && bindValues.length == that.bindValues.length;
   }
 
   @Override
   public boolean isSameByBind(SpiExpression other) {
     InExpression that = (InExpression) other;
-    if (this.values.length != that.values.length) {
+    if (this.bindValues.length != that.bindValues.length) {
       return false;
     }
-    for (int i = 0; i < values.length; i++) {
-      if (!values[i].equals(that.values[i])) {
+    for (int i = 0; i < bindValues.length; i++) {
+      if (!bindValues[i].equals(that.bindValues[i])) {
         return false;
       }
     }

src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java

@@ -38,6 +38,11 @@ class InQueryExpression extends AbstractExpression implements UnsupportedDocStor
     this.bindParams = bindParams;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     throw new IllegalStateException("Not supported");

src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java

@@ -39,9 +39,9 @@ import java.util.Set;
  */
 class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {
 
-  protected final DefaultExpressionList<T> exprList;
+  protected DefaultExpressionList<T> exprList;
 
-  protected final Junction.Type type;
+  protected Junction.Type type;
 
   JunctionExpression(Junction.Type type, Query<T> query, ExpressionList<T> parent) {
     this.type = type;
@@ -56,6 +56,31 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     this.exprList = exprList;
   }
 
+  /**
+   * Simplify nested expressions where possible.
+   * <p>
+   * This is expected to only used after expressions are built via query language parsing.
+   * </p>
+   */
+  public void simplify() {
+    exprList.simplifyEntries();
+
+    List<SpiExpression> list = exprList.list;
+    if (list.size() == 1 && list.get(0) instanceof JunctionExpression) {
+      JunctionExpression nested = (JunctionExpression)list.get(0);
+      if (type == Type.AND && !nested.type.isText()) {
+        // and (and (a, b, c)) -> and (a, b, c)
+        // and (not (a, b, c)) -> not (a, b, c)
+        // and (or  (a, b, c)) -> or  (a, b, c)
+        this.exprList = nested.exprList;
+        this.type = nested.type;
+      } else if (type == Type.NOT && nested.type == Type.AND) {
+        // not (and (a, b, c)) -> not (a, b, c)
+        this.exprList = nested.exprList;
+      }
+    }
+  }
+
   public SpiExpression copyForPlanKey() {
     return new JunctionExpression<T>(type, exprList.copyForPlanKey());
   }

src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java

@@ -8,24 +8,21 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-class LikeExpression extends AbstractExpression {
-
-  private final String val;
+class LikeExpression extends AbstractValueExpression {
 
   private final boolean caseInsensitive;
 
   private final LikeType type;
 
-  LikeExpression(String propertyName, String value, boolean caseInsensitive, LikeType type) {
-    super(propertyName);
+  LikeExpression(String propertyName, Object value, boolean caseInsensitive, LikeType type) {
+    super(propertyName, value);
     this.caseInsensitive = caseInsensitive;
     this.type = type;
-    this.val = value;
   }
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeLike(propName, val, type, caseInsensitive);
+    context.writeLike(propName, strValue(), type, caseInsensitive);
   }
 
   @Override
@@ -38,7 +35,7 @@ class LikeExpression extends AbstractExpression {
       request.addBindEncryptKey(encryptKey);
     }
 
-    String bindValue = getValue(val, caseInsensitive, type);
+    String bindValue = getValue(strValue(), caseInsensitive, type);
     request.addBindValue(bindValue);
   }
 
@@ -74,7 +71,7 @@ class LikeExpression extends AbstractExpression {
 
   @Override
   public int queryBindHash() {
-    return val.hashCode();
+    return strValue().hashCode();
   }
 
   @Override
@@ -92,7 +89,7 @@ class LikeExpression extends AbstractExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     LikeExpression that = (LikeExpression) other;
-    return val.equals(that.val);
+    return strValue().equals(that.strValue());
   }
 
   private static String getValue(String value, boolean caseInsensitive, LikeType type) {

src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java

@@ -57,6 +57,11 @@ abstract class LogicExpression implements SpiExpression {
     this.expTwo = (SpiExpression) expTwo;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
 

src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java

@@ -0,0 +1,43 @@
+package com.avaje.ebeaninternal.server.expression;
+
+import com.avaje.ebeaninternal.api.SpiNamedParam;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Helper for evaluating named parameters.
+ */
+class NamedParamHelp {
+
+  /**
+   * Return the bind value taking into account named parameters.
+   */
+  static Object value(Object val) {
+    if (val instanceof SpiNamedParam) {
+      return ((SpiNamedParam) val).getValue();
+    }
+    return val;
+  }
+
+  /**
+   * Return the value as a string.
+   */
+  static String valueAsString(Object val) {
+    Object value = value(val);
+    return (value == null) ? null : value.toString();
+  }
+
+  /**
+   * Add the potentially named parameter(s) to the values.
+   */
+  public static void valueAdd(List<Object> values, Object sourceValue) {
+
+    Object value = value(sourceValue);
+    if (value instanceof Collection) {
+      values.addAll((Collection)value);
+    } else {
+      values.add(value);
+    }
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/expression/NestedPathWrapperExpression.java

@@ -24,6 +24,11 @@ class NestedPathWrapperExpression implements SpiExpression {
     this.delegate = delegate;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.startNested(nestedPath);

src/main/java/com/avaje/ebeaninternal/server/expression/NonPrepareExpression.java

@@ -8,6 +8,11 @@ import com.avaje.ebeaninternal.api.SpiExpression;
  */
 abstract class NonPrepareExpression implements SpiExpression {
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
     // do nothing

src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java

@@ -17,6 +17,11 @@ class NoopExpression implements SpiExpression {
 
   protected static final NoopExpression INSTANCE = new NoopExpression();
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public SpiExpression copyForPlanKey() {
     return this;

src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java

@@ -22,6 +22,11 @@ final class NotExpression implements SpiExpression {
     this.exp = (SpiExpression) exp;
   }
 
+  @Override
+  public void simplify() {
+    // do nothing
+  }
+
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.startBoolMustNot();

src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java

@@ -9,22 +9,19 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
 
-public class SimpleExpression extends AbstractExpression {
+public class SimpleExpression extends AbstractValueExpression {
 
   private final Op type;
 
-  private final Object value;
-
   public SimpleExpression(String propertyName, Op type, Object value) {
-    super(propertyName);
+    super(propertyName, value);
     this.type = type;
-    this.value = value;
   }
 
   @Override
   public Object getIdEqualTo(String idName) {
     if (type == Op.EQ && idName.equals(propName)) {
-      return value;
+      return value();
     }
     return null;
   }
@@ -37,13 +34,13 @@ public class SimpleExpression extends AbstractExpression {
     ExpressionPath prop = context.getExpressionPath(propName);
     if (prop != null && prop.isAssocId()) {
       String idName = prop.getAssocIdExpression(propName, "");
-      Object[] ids = prop.getAssocIdValues((EntityBean) value);
+      Object[] ids = prop.getAssocIdValues((EntityBean) value());
       if (ids == null || ids.length != 1) {
         throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + ids);
       }
       context.writeSimple(type, idName, ids[0]);
     } else {
-      context.writeSimple(type, propName, value);
+      context.writeSimple(type, propName, value());
     }
   }
 
@@ -56,7 +53,7 @@ public class SimpleExpression extends AbstractExpression {
   }
 
   public Object getValue() {
-    return value;
+    return value();
   }
 
   @Override
@@ -65,7 +62,7 @@ public class SimpleExpression extends AbstractExpression {
     ElPropertyValue prop = getElProp(request);
     if (prop != null) {
       if (prop.isAssocId()) {
-        Object[] ids = prop.getAssocIdValues((EntityBean) value);
+        Object[] ids = prop.getAssocIdValues((EntityBean) value());
         if (ids != null) {
           for (int i = 0; i < ids.length; i++) {
             request.addBindValue(ids[i]);
@@ -83,7 +80,7 @@ public class SimpleExpression extends AbstractExpression {
       // prop.getBeanProperty().getScalarType();
     }
 
-    request.addBindValue(value);
+    request.addBindValue(value());
   }
 
   @Override
@@ -115,7 +112,7 @@ public class SimpleExpression extends AbstractExpression {
 
   @Override
   public int queryBindHash() {
-    return value.hashCode();
+    return value().hashCode();
   }
 
   @Override
@@ -132,6 +129,6 @@ public class SimpleExpression extends AbstractExpression {
   @Override
   public boolean isSameByBind(SpiExpression other) {
     SimpleExpression that = (SimpleExpression) other;
-    return value.equals(that.value);
+    return value().equals(that.value());
   }
 }

src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java

@@ -0,0 +1,374 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import com.avaje.ebean.Expression;
+import com.avaje.ebean.ExpressionList;
+import com.avaje.ebean.FetchConfig;
+import com.avaje.ebean.LikeType;
+import com.avaje.ebean.OrderBy;
+import com.avaje.ebeaninternal.api.SpiQuery;
+import com.avaje.ebeaninternal.server.grammer.antlr.EQLBaseListener;
+import com.avaje.ebeaninternal.server.grammer.antlr.EQLLexer;
+import com.avaje.ebeaninternal.server.grammer.antlr.EQLParser;
+import com.avaje.ebeaninternal.server.util.ArrayStack;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class EqlAdapter<T> extends EQLBaseListener {
+
+  private static final OperatorMapping operatorMapping = new OperatorMapping();
+
+  private static final String DISTINCT = "distinct";
+
+  private static final String NULLS = "nulls";
+
+  private static final String ASC = "asc";
+
+  private final SpiQuery<T> query;
+
+  private final EqlAdapterHelper helper;
+
+  private ArrayStack<ExpressionList<T>> textStack;
+
+  private ArrayStack<ExpressionList<T>> whereStack;
+
+  private boolean textMode;
+
+  private List<Object> inValues;
+
+  private String inPropertyName;
+
+  public EqlAdapter(SpiQuery<T> query) {
+    this.query = query;
+    this.helper = new EqlAdapterHelper(this);
+  }
+
+  /**
+   * Return the current expression list that expressions should be added to.
+   */
+  protected ExpressionList<T> peekExprList() {
+
+    if (textMode) {
+      // return the current text expression list
+      return _peekText();
+    }
+
+    if (whereStack == null) {
+      whereStack = new ArrayStack<ExpressionList<T>>();
+      whereStack.push(query.where());
+    }
+    // return the current expression list
+    return whereStack.peek();
+  }
+
+  private ExpressionList<T> _peekText() {
+    if (textStack == null) {
+      textStack = new ArrayStack<ExpressionList<T>>();
+      // empty so push on the queries base expression list
+      textStack.push(query.text());
+    }
+    // return the current expression list
+    return textStack.peek();
+  }
+
+  /**
+   * Push the expression list onto the appropriate stack.
+   */
+  private void pushExprList(ExpressionList<T> list) {
+    if (textMode) {
+      textStack.push(list);
+    } else {
+      whereStack.push(list);
+    }
+  }
+
+  /**
+   * End a list of expressions added by 'OR'.
+   */
+  private void popJunction() {
+    if (textMode) {
+      textStack.pop();
+    } else {
+      whereStack.pop();
+    }
+  }
+
+  @Override
+  public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
+
+    checkChildren(ctx, 4);
+    if (DISTINCT.equals(child(ctx, 1))) {
+      query.setDistinct(true);
+      query.select(child(ctx, 3));
+    } else {
+      query.select(child(ctx, 2));
+    }
+  }
+
+  @Override
+  public void enterFetch_path(EQLParser.Fetch_pathContext ctx) {
+
+    int childCount = ctx.getChildCount();
+    checkChildren(ctx, 2);
+    String path = child(ctx, 1);
+
+    int noPropertiesLength = 2;
+
+    FetchConfig fetchConfig = ParseFetchConfig.parse(path);
+    if (fetchConfig != null) {
+      noPropertiesLength = 3;
+      path = child(ctx, 2);
+    }
+    if (childCount == noPropertiesLength) {
+      query.fetch(path, fetchConfig);
+
+    } else {
+      String fetchProperties = trimParenthesis(ctx.getChild(noPropertiesLength).getText());
+      query.fetch(path, fetchProperties, fetchConfig);
+    }
+  }
+
+  @Override
+  public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
+
+    int childCount = ctx.getChildCount();
+
+    String path = child(ctx, 0);
+    boolean asc = true;
+    String nulls = null;
+    String nullsFirstLast = null;
+
+    if (childCount == 3) {
+      asc = child(ctx, 1).startsWith(ASC);
+      nullsFirstLast = ctx.getChild(2).getChild(1).getText();
+      nulls = NULLS;
+
+    } else if (childCount == 2) {
+      String firstChild = child(ctx, 1);
+      if (firstChild.startsWith(NULLS)) {
+        nullsFirstLast = ctx.getChild(1).getChild(1).getText();
+        nulls = NULLS;
+      } else {
+        asc = firstChild.startsWith(ASC);
+      }
+    }
+
+    query.orderBy().add(new OrderBy.Property(path, asc, nulls, nullsFirstLast));
+  }
+
+  @Override
+  public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) {
+
+    try {
+      String limitValue = child(ctx, 1);
+      query.setMaxRows(Integer.parseInt(limitValue));
+
+      int childCount = ctx.getChildCount();
+      if (childCount == 3) {
+        ParseTree offsetTree = ctx.getChild(2);
+        String offsetValue = offsetTree.getChild(1).getText();
+        query.setFirstRow(Integer.parseInt(offsetValue));
+      }
+    } catch (NumberFormatException e) {
+      throw new IllegalArgumentException("Error parsing limit or offset parameter - not an integer", e);
+    }
+  }
+
+  /**
+   * Trim leading '(' and trailing ')'
+   */
+  private String trimParenthesis(String text) {
+    text = text.substring(1);
+    text = text.substring(0, text.length()-1);
+    return text;
+  }
+
+  private String getLeftHandSidePath(ParserRuleContext ctx) {
+    TerminalNode pathToken = ctx.getToken(EQLLexer.PATH_VARIABLE, 0);
+    return pathToken.getText();
+  }
+
+  @Override
+  public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
+
+    checkChildren(ctx, 5);
+    String path = getLeftHandSidePath(ctx);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.BETWEEN) {
+      throw new IllegalStateException("Expecting BETWEEN operator but got "+op);
+    }
+    helper.addBetween(path, child(ctx,2), child(ctx,4));
+  }
+
+  @Override
+  public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
+    checkChildren(ctx, 5);
+    String rawValue = child(ctx,0);
+    EqlOperator op = getOperator(ctx);
+    if (op != EqlOperator.BETWEEN) {
+      throw new IllegalStateException("Expecting BETWEEN operator but got "+op);
+    }
+    helper.addBetweenProperty(rawValue, child(ctx,2), child(ctx,4));
+  }
+
+  @Override
+  public void enterIn_expression(EQLParser.In_expressionContext ctx) {
+    this.inValues = new ArrayList<Object>();
+    this.inPropertyName = getLeftHandSidePath(ctx);
+  }
+
+  @Override
+  public void enterIn_value(EQLParser.In_valueContext ctx) {
+    int childCount = ctx.getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      String text = child(ctx, i);
+      if (isValue(text)) {
+        inValues.add(helper.bind(text));
+      }
+    }
+  }
+
+  private String child(ParserRuleContext ctx, int position) {
+    ParseTree child = ctx.getChild(position);
+    return child.getText();
+  }
+
+  private boolean isValue(String text) {
+    if (text.length() == 1 && (text.equals("(") || text.equals(")") || text.equals(","))) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public void exitIn_expression(EQLParser.In_expressionContext ctx) {
+    helper.addIn(inPropertyName, inValues);
+  }
+
+  @Override
+  public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNull(path);
+  }
+
+  @Override
+  public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNotNull(path);
+  }
+
+  @Override
+  public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isEmpty(path);
+  }
+
+  @Override
+  public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
+    String path = getLeftHandSidePath(ctx);
+    peekExprList().isNotEmpty(path);
+  }
+
+  @Override
+  public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
+    addExpression(ctx);
+  }
+
+  @Override
+  public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
+    addExpression(ctx);
+  }
+
+  private void addExpression(ParserRuleContext ctx) {
+    int childCount = ctx.getChildCount();
+    if (childCount < 3) {
+      throw new IllegalStateException("expecting 3 children for comparison? " + ctx);
+    }
+    String path = getLeftHandSidePath(ctx);
+    String operator = child(ctx, 1);
+    EqlOperator op = operatorMapping.get(operator);
+    if (op == null) {
+      throw new IllegalStateException("No operator found for " + operator);
+    }
+
+    // RHS is Path, Literal or Named input parameter
+    helper.addExpression(path, op, child(ctx, 2));
+  }
+
+
+  @Override
+  public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
+    int childCount = ctx.getChildCount();
+    if (childCount > 1) {
+      pushExprList(peekExprList().and());
+    }
+  }
+
+  @Override
+  public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  @Override
+  public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      pushExprList(peekExprList().or());
+    }
+  }
+
+  @Override
+  public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  @Override
+  public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      pushExprList(peekExprList().not());
+    }
+  }
+
+  @Override
+  public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
+    if (ctx.getChildCount() > 1) {
+      popJunction();
+    }
+  }
+
+  private EqlOperator getOperator(ParserRuleContext ctx) {
+    String operator = child(ctx,1);
+    EqlOperator op = operatorMapping.get(operator);
+    if (op == null) {
+      throw new IllegalStateException("No operator found for " + operator);
+    }
+    return op;
+  }
+
+  /**
+   * Check for the minimum number of children.
+   */
+  private void checkChildren(ParserRuleContext ctx, int min) {
+    if (ctx.getChildCount() < min) {
+      throw new IllegalStateException("expecting " + min + " children for comparison? " + ctx);
+    }
+  }
+
+  public Object namedParam(String parameterName) {
+    return query.createNamedParameter(parameterName);
+  }
+
+  public Expression like(boolean caseInsensitive, LikeType likeType, String property, Object bindValue) {
+    return query.getExpressionFactory().like(property, bindValue, caseInsensitive, likeType);
+  }
+
+  public Expression ieq(String property, Object bindValue) {
+    return query.getExpressionFactory().ieqObject(property, bindValue);
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java

@@ -0,0 +1,140 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import com.avaje.ebean.ExpressionList;
+import com.avaje.ebean.LikeType;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+class EqlAdapterHelper {
+
+  private final EqlAdapter owner;
+
+  public EqlAdapterHelper(EqlAdapter owner) {
+    this.owner = owner;
+  }
+
+  enum ValueType {
+    NAMED_PARAM,
+    STRING,
+    BOOL,
+    NUMBER
+  }
+
+  private ValueType getValueType(String valueAsText) {
+
+    char firstChar = Character.toLowerCase(valueAsText.charAt(0));
+    switch (firstChar) {
+      case ':':
+        return ValueType.NAMED_PARAM;
+      case 't':
+        return ValueType.BOOL;
+      case 'f':
+        return ValueType.BOOL;
+      case '\'':
+        return ValueType.STRING;
+      default:
+        if (Character.isDigit(firstChar)) {
+          return ValueType.NUMBER;
+        }
+        throw new IllegalArgumentException("Unexpected first character in value [" + valueAsText + "]");
+    }
+  }
+
+  protected void addBetweenProperty(String rawValue, String lowProperty, String highProperty) {
+    peekExprList().betweenProperties(lowProperty, highProperty, bind(rawValue));
+  }
+
+  protected void addBetween(String path, String value1, String value2) {
+    peekExprList().between(path, bind(value1), bind(value2));
+  }
+
+  @SuppressWarnings("unchecked")
+  protected void addIn(String path, List<Object> inValues) {
+    peekExprList().in(path, inValues);
+  }
+
+  protected void addExpression(String path, EqlOperator op, String value) {
+
+    switch (op) {
+      case EQ:
+        peekExprList().eq(path, bind(value));
+        break;
+      case IEQ:
+        peekExprList().add(owner.ieq(path, bind(value)));
+        break;
+      case NE:
+        peekExprList().ne(path, bind(value));
+        break;
+      case GT:
+        peekExprList().gt(path, bind(value));
+        break;
+      case LT:
+        peekExprList().lt(path, bind(value));
+        break;
+      case GTE:
+        peekExprList().ge(path, bind(value));
+        break;
+      case LTE:
+        peekExprList().le(path, bind(value));
+        break;
+      case LIKE:
+        addLike(false, LikeType.RAW, path, bind(value));
+        break;
+      case CONTAINS:
+        addLike(false, LikeType.CONTAINS, path, bind(value));
+        break;
+      case STARTS_WITH:
+        addLike(false, LikeType.STARTS_WITH, path, bind(value));
+        break;
+      case ENDS_WITH:
+        addLike(false, LikeType.ENDS_WITH, path, bind(value));
+        break;
+      case ILIKE:
+        addLike(true, LikeType.RAW, path, bind(value));
+        break;
+      case ICONTAINS:
+        addLike(true, LikeType.CONTAINS, path, bind(value));
+        break;
+      case ISTARTS_WITH:
+        addLike(true, LikeType.STARTS_WITH, path, bind(value));
+        break;
+      case IENDS_WITH:
+        addLike(true, LikeType.ENDS_WITH, path, bind(value));
+        break;
+      default:
+        throw new IllegalStateException("Unhandled operator " + op);
+    }
+
+  }
+
+  private void addLike(boolean caseInsensitive, LikeType likeType, String path, Object bindValue) {
+    peekExprList().add(owner.like(caseInsensitive, likeType, path, bindValue));
+  }
+
+  protected Object bind(String value) {
+    ValueType valueType = getValueType(value);
+    return getBindValue(valueType, value);
+  }
+
+  private ExpressionList peekExprList() {
+    return owner.peekExprList();
+  }
+
+  private Object getBindValue(ValueType valueType, String value) {
+    switch (valueType) {
+      case BOOL: return Boolean.parseBoolean(value);
+      case NUMBER: return new BigDecimal(value);
+      case STRING: return unquote(value);
+      case NAMED_PARAM: return owner.namedParam(value.substring(1));
+      default:
+        throw new IllegalArgumentException("Unhandled valueType "+valueType);
+    }
+  }
+
+  private String unquote(String value) {
+    String raw = value.substring(1, value.length() - 1);
+    //raw.replaceAll();
+    return raw;
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java

@@ -0,0 +1,22 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+enum EqlOperator {
+
+  EQ,
+  IEQ,
+  NE,
+  LT,
+  LTE,
+  GT,
+  GTE,
+  CONTAINS,
+  STARTS_WITH,
+  ENDS_WITH,
+  LIKE,
+  ICONTAINS,
+  ISTARTS_WITH,
+  IENDS_WITH,
+  ILIKE,
+  BETWEEN
+
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java

@@ -0,0 +1,32 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import com.avaje.ebeaninternal.api.SpiQuery;
+import com.avaje.ebeaninternal.server.grammer.antlr.EQLLexer;
+import com.avaje.ebeaninternal.server.grammer.antlr.EQLParser;
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+
+/**
+ * Parse EQL query language applying it to an ORM query object.
+ */
+public class EqlParser {
+
+  /**
+   * Parse the raw EQL query and apply it to the supplied query.
+   */
+  public static <T> void parse(String raw, SpiQuery<T> query) {
+
+    EQLLexer lexer = new EQLLexer(new ANTLRInputStream(raw));
+    CommonTokenStream tokens = new CommonTokenStream(lexer);
+    EQLParser parser = new EQLParser(tokens);
+    EQLParser.Select_statementContext context = parser.select_statement();
+
+    EqlAdapter<T> adapter = new EqlAdapter<T>(query);
+
+    ParseTreeWalker walker = new ParseTreeWalker();
+    walker.walk(adapter, context);
+
+    query.simplifyExpressions();
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/NamedParameter.java

@@ -0,0 +1,16 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+public class NamedParameter {
+
+  public static final String PREFIX = "$namedParam$";
+
+  private final String name;
+
+  public NamedParameter(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java

@@ -0,0 +1,49 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class OperatorMapping {
+
+  Map<String,EqlOperator> map = new HashMap<String,EqlOperator>();
+
+  public OperatorMapping() {
+    map.put("eq", EqlOperator.EQ);
+    map.put("=", EqlOperator.EQ);
+    map.put("ieq", EqlOperator.IEQ);
+
+    map.put("ne", EqlOperator.NE);
+    map.put("<>", EqlOperator.NE);
+    map.put("!=", EqlOperator.NE);
+
+    map.put(">", EqlOperator.GT);
+    map.put("gt", EqlOperator.GT);
+
+    map.put(">=", EqlOperator.GTE);
+    map.put("gte", EqlOperator.GTE);
+    map.put("ge", EqlOperator.GTE);
+
+    map.put("<", EqlOperator.LT);
+    map.put("lt", EqlOperator.LT);
+
+    map.put("<=", EqlOperator.LTE);
+    map.put("lte", EqlOperator.LTE);
+    map.put("le", EqlOperator.LTE);
+
+    map.put("contains", EqlOperator.CONTAINS);
+    map.put("startsWith", EqlOperator.STARTS_WITH);
+    map.put("endsWith", EqlOperator.ENDS_WITH);
+    map.put("like", EqlOperator.LIKE);
+
+    map.put("icontains", EqlOperator.ICONTAINS);
+    map.put("istartsWith", EqlOperator.ISTARTS_WITH);
+    map.put("iendsWith", EqlOperator.IENDS_WITH);
+    map.put("ilike", EqlOperator.ILIKE);
+
+    map.put("between", EqlOperator.BETWEEN);
+  }
+
+  public EqlOperator get(String key) {
+    return map.get(key);
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfig.java

@@ -0,0 +1,49 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import com.avaje.ebean.FetchConfig;
+
+/**
+ * Parse the path that potentially is a FetchConfig definition.
+ */
+class ParseFetchConfig {
+
+  /**
+   * Parse the path that potentially is a FetchConfig definition.
+   * <p>
+   * Return the FetchConfig if it is and otherwise null.
+   * </p>
+   */
+  static FetchConfig parse(String path) {
+
+    if (path.startsWith("lazy")) {
+      if (path.length() == 4) {
+        return new FetchConfig().lazy();
+      } else if (path.charAt(4) == '(') {
+        path = path.substring(5);
+        int batchSize = parseBatchSize(path);
+        return new FetchConfig().lazy(batchSize);
+      } else {
+        return null;
+      }
+    }
+
+    if (path.startsWith("query")) {
+      if (path.length() == 5) {
+        return new FetchConfig().query();
+      } else if (path.charAt(5) == '(') {
+        path = path.substring(6);
+        int batchSize = parseBatchSize(path);
+        return new FetchConfig().query(batchSize);
+      } else {
+        return null;
+      }
+    }
+
+    return null;
+  }
+
+  private static int parseBatchSize(String path) {
+    path = path.substring(0, path.length()-1);
+    return Integer.parseInt(path);
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens

@@ -0,0 +1,124 @@
+T__0=1
+T__1=2
+T__2=3
+T__3=4
+T__4=5
+T__5=6
+T__6=7
+T__7=8
+T__8=9
+T__9=10
+T__10=11
+T__11=12
+T__12=13
+T__13=14
+T__14=15
+T__15=16
+T__16=17
+T__17=18
+T__18=19
+T__19=20
+T__20=21
+T__21=22
+T__22=23
+T__23=24
+T__24=25
+T__25=26
+T__26=27
+T__27=28
+T__28=29
+T__29=30
+T__30=31
+T__31=32
+T__32=33
+T__33=34
+T__34=35
+T__35=36
+T__36=37
+T__37=38
+T__38=39
+T__39=40
+T__40=41
+T__41=42
+T__42=43
+T__43=44
+T__44=45
+T__45=46
+T__46=47
+T__47=48
+T__48=49
+T__49=50
+T__50=51
+T__51=52
+T__52=53
+T__53=54
+T__54=55
+T__55=56
+T__56=57
+INPUT_VARIABLE=58
+PATH_VARIABLE=59
+BOOLEAN_LITERAL=60
+NUMBER_LITERAL=61
+DOUBLE=62
+INT=63
+ZERO=64
+STRING_LITERAL=65
+WS=66
+'select'=1
+'('=2
+')'=3
+'distinct'=4
+'where'=5
+'order'=6
+'by'=7
+','=8
+'nulls'=9
+'first'=10
+'last'=11
+'asc'=12
+'desc'=13
+'limit'=14
+'offset'=15
+'fetch'=16
+'+'=17
+'query'=18
+'lazy'=19
+'or'=20
+'and'=21
+'not'=22
+'in'=23
+'between'=24
+'is'=25
+'null'=26
+'isNull'=27
+'isNotNull'=28
+'notNull'=29
+'empty'=30
+'isEmpty'=31
+'isNotEmpty'=32
+'notEmpty'=33
+'like'=34
+'ilike'=35
+'contains'=36
+'icontains'=37
+'startsWith'=38
+'istartsWith'=39
+'endsWith'=40
+'iendsWith'=41
+'='=42
+'eq'=43
+'>'=44
+'gt'=45
+'>='=46
+'ge'=47
+'gte'=48
+'<'=49
+'lt'=50
+'<='=51
+'le'=52
+'lte'=53
+'<>'=54
+'!='=55
+'ne'=56
+'ieq'=57
+'0'=64

src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java

@@ -0,0 +1,519 @@
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
+package com.avaje.ebeaninternal.server.grammer.antlr;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+/**
+ * This class provides an empty implementation of {@link EQLListener},
+ * which can be extended to create a listener which only needs to handle a subset
+ * of the available methods.
+ */
+public class EQLBaseListener implements EQLListener {
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_statement(EQLParser.Select_statementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSelect_clause(EQLParser.Select_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSelect_clause(EQLParser.Select_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDistinct(EQLParser.DistinctContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDistinct(EQLParser.DistinctContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_clause(EQLParser.Fetch_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_clause(EQLParser.Fetch_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterWhere_clause(EQLParser.Where_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitWhere_clause(EQLParser.Where_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOrderby_property(EQLParser.Orderby_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAsc_desc(EQLParser.Asc_descContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAsc_desc(EQLParser.Asc_descContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLimit_clause(EQLParser.Limit_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterOffset_clause(EQLParser.Offset_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitOffset_clause(EQLParser.Offset_clauseContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_path(EQLParser.Fetch_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_path(EQLParser.Fetch_pathContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_property(EQLParser.Fetch_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_property(EQLParser.Fetch_propertyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_option(EQLParser.Fetch_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_option(EQLParser.Fetch_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_term(EQLParser.Conditional_termContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_term(EQLParser.Conditional_termContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConditional_primary(EQLParser.Conditional_primaryContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConditional_primary(EQLParser.Conditional_primaryContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAny_expression(EQLParser.Any_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAny_expression(EQLParser.Any_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIn_expression(EQLParser.In_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIn_expression(EQLParser.In_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIn_value(EQLParser.In_valueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIn_value(EQLParser.In_valueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterBetween_expression(EQLParser.Between_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitBetween_expression(EQLParser.Between_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLike_expression(EQLParser.Like_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLike_expression(EQLParser.Like_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLike_op(EQLParser.Like_opContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLike_op(EQLParser.Like_opContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitComparison_expression(EQLParser.Comparison_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterComparison_operator(EQLParser.Comparison_operatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitComparison_operator(EQLParser.Comparison_operatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterValue_expression(EQLParser.Value_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitValue_expression(EQLParser.Value_expressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterLiteral(EQLParser.LiteralContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitLiteral(EQLParser.LiteralContext ctx) { }
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterEveryRule(ParserRuleContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitEveryRule(ParserRuleContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void visitTerminal(TerminalNode node) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void visitErrorNode(ErrorNode node) { }
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java

@@ -0,0 +1,295 @@
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
+package com.avaje.ebeaninternal.server.grammer.antlr;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.*;
+import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.misc.*;
+
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+public class EQLLexer extends Lexer {
+	static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
+
+	protected static final DFA[] _decisionToDFA;
+	protected static final PredictionContextCache _sharedContextCache =
+		new PredictionContextCache();
+	public static final int
+		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
+		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
+		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
+		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
+		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
+		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45, 
+		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52, 
+		T__52=53, T__53=54, T__54=55, T__55=56, T__56=57, INPUT_VARIABLE=58, PATH_VARIABLE=59, 
+		BOOLEAN_LITERAL=60, NUMBER_LITERAL=61, DOUBLE=62, INT=63, ZERO=64, STRING_LITERAL=65, 
+		WS=66;
+	public static String[] modeNames = {
+		"DEFAULT_MODE"
+	};
+
+	public static final String[] ruleNames = {
+		"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
+		"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
+		"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24", 
+		"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32", 
+		"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", 
+		"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48", 
+		"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56", 
+		"INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", 
+		"DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
+	};
+
+	private static final String[] _LITERAL_NAMES = {
+		null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'", 
+		"','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", 
+		"'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", 
+		"'between'", "'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'", 
+		"'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", 
+		"'contains'", "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", 
+		"'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'", 
+		"'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", 
+		null, null, null, null, null, null, "'0'"
+	};
+	private static final String[] _SYMBOLIC_NAMES = {
+		null, null, null, null, null, null, null, null, null, null, null, null, 
+		null, null, null, null, null, null, null, null, null, null, null, null, 
+		null, null, null, null, null, null, null, null, null, null, null, null, 
+		null, null, null, null, null, null, null, null, null, null, null, null, 
+		null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", 
+		"PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", 
+		"ZERO", "STRING_LITERAL", "WS"
+	};
+	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+	/**
+	 * @deprecated Use {@link #VOCABULARY} instead.
+	 */
+	@Deprecated
+	public static final String[] tokenNames;
+	static {
+		tokenNames = new String[_SYMBOLIC_NAMES.length];
+		for (int i = 0; i < tokenNames.length; i++) {
+			tokenNames[i] = VOCABULARY.getLiteralName(i);
+			if (tokenNames[i] == null) {
+				tokenNames[i] = VOCABULARY.getSymbolicName(i);
+			}
+
+			if (tokenNames[i] == null) {
+				tokenNames[i] = "<INVALID>";
+			}
+		}
+	}
+
+	@Override
+	@Deprecated
+	public String[] getTokenNames() {
+		return tokenNames;
+	}
+
+	@Override
+
+	public Vocabulary getVocabulary() {
+		return VOCABULARY;
+	}
+
+
+	public EQLLexer(CharStream input) {
+		super(input);
+		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+	}
+
+	@Override
+	public String getGrammarFileName() { return "EQL.g4"; }
+
+	@Override
+	public String[] getRuleNames() { return ruleNames; }
+
+	@Override
+	public String getSerializedATN() { return _serializedATN; }
+
+	@Override
+	public String[] getModeNames() { return modeNames; }
+
+	@Override
+	public ATN getATN() { return _ATN; }
+
+	public static final String _serializedATN =
+		"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2D\u0200\b\1\4\2\t"+
+		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
+		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
+		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
+		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
+		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
+		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
+		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
+		"\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3"+
+		"\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6"+
+		"\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3"+
+		"\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16"+
+		"\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20"+
+		"\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23"+
+		"\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26"+
+		"\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\31"+
+		"\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34"+
+		"\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36"+
+		"\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3"+
+		" \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3"+
+		"\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%"+
+		"\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3"+
+		"\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3"+
+		")\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3.\3.\3"+
+		"/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3\63\3"+
+		"\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\38\38"+
+		"\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\7;\u01bb\n;\f;\16;\u01be\13;\3<\3<\7"+
+		"<\u01c2\n<\f<\16<\u01c5\13<\3=\3=\3=\3=\3=\3=\3=\3=\3=\5=\u01d0\n=\3>"+
+		"\5>\u01d3\n>\3>\3>\5>\u01d7\n>\3>\3>\5>\u01db\n>\3?\6?\u01de\n?\r?\16"+
+		"?\u01df\3?\3?\7?\u01e4\n?\f?\16?\u01e7\13?\3@\3@\7@\u01eb\n@\f@\16@\u01ee"+
+		"\13@\3A\3A\3B\3B\3B\3B\7B\u01f6\nB\fB\16B\u01f9\13B\3B\3B\3C\3C\3C\3C"+
+		"\2\2D\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35"+
+		"\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36"+
+		";\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67"+
+		"m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\3\2\t\5\2C\\aac|\6\2\62;"+
+		"C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\""+
+		"\u020b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2"+
+		"\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3"+
+		"\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2"+
+		"\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2"+
+		"/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2"+
+		"\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2"+
+		"G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3"+
+		"\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2"+
+		"\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2"+
+		"m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3"+
+		"\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2"+
+		"\2\2\2\u0085\3\2\2\2\3\u0087\3\2\2\2\5\u008e\3\2\2\2\7\u0090\3\2\2\2\t"+
+		"\u0092\3\2\2\2\13\u009b\3\2\2\2\r\u00a1\3\2\2\2\17\u00a7\3\2\2\2\21\u00aa"+
+		"\3\2\2\2\23\u00ac\3\2\2\2\25\u00b2\3\2\2\2\27\u00b8\3\2\2\2\31\u00bd\3"+
+		"\2\2\2\33\u00c1\3\2\2\2\35\u00c6\3\2\2\2\37\u00cc\3\2\2\2!\u00d3\3\2\2"+
+		"\2#\u00d9\3\2\2\2%\u00db\3\2\2\2\'\u00e1\3\2\2\2)\u00e6\3\2\2\2+\u00e9"+
+		"\3\2\2\2-\u00ed\3\2\2\2/\u00f1\3\2\2\2\61\u00f4\3\2\2\2\63\u00fc\3\2\2"+
+		"\2\65\u00ff\3\2\2\2\67\u0104\3\2\2\29\u010b\3\2\2\2;\u0115\3\2\2\2=\u011d"+
+		"\3\2\2\2?\u0123\3\2\2\2A\u012b\3\2\2\2C\u0136\3\2\2\2E\u013f\3\2\2\2G"+
+		"\u0144\3\2\2\2I\u014a\3\2\2\2K\u0153\3\2\2\2M\u015d\3\2\2\2O\u0168\3\2"+
+		"\2\2Q\u0174\3\2\2\2S\u017d\3\2\2\2U\u0187\3\2\2\2W\u0189\3\2\2\2Y\u018c"+
+		"\3\2\2\2[\u018e\3\2\2\2]\u0191\3\2\2\2_\u0194\3\2\2\2a\u0197\3\2\2\2c"+
+		"\u019b\3\2\2\2e\u019d\3\2\2\2g\u01a0\3\2\2\2i\u01a3\3\2\2\2k\u01a6\3\2"+
+		"\2\2m\u01aa\3\2\2\2o\u01ad\3\2\2\2q\u01b0\3\2\2\2s\u01b3\3\2\2\2u\u01b7"+
+		"\3\2\2\2w\u01bf\3\2\2\2y\u01cf\3\2\2\2{\u01da\3\2\2\2}\u01dd\3\2\2\2\177"+
+		"\u01e8\3\2\2\2\u0081\u01ef\3\2\2\2\u0083\u01f1\3\2\2\2\u0085\u01fc\3\2"+
+		"\2\2\u0087\u0088\7u\2\2\u0088\u0089\7g\2\2\u0089\u008a\7n\2\2\u008a\u008b"+
+		"\7g\2\2\u008b\u008c\7e\2\2\u008c\u008d\7v\2\2\u008d\4\3\2\2\2\u008e\u008f"+
+		"\7*\2\2\u008f\6\3\2\2\2\u0090\u0091\7+\2\2\u0091\b\3\2\2\2\u0092\u0093"+
+		"\7f\2\2\u0093\u0094\7k\2\2\u0094\u0095\7u\2\2\u0095\u0096\7v\2\2\u0096"+
+		"\u0097\7k\2\2\u0097\u0098\7p\2\2\u0098\u0099\7e\2\2\u0099\u009a\7v\2\2"+
+		"\u009a\n\3\2\2\2\u009b\u009c\7y\2\2\u009c\u009d\7j\2\2\u009d\u009e\7g"+
+		"\2\2\u009e\u009f\7t\2\2\u009f\u00a0\7g\2\2\u00a0\f\3\2\2\2\u00a1\u00a2"+
+		"\7q\2\2\u00a2\u00a3\7t\2\2\u00a3\u00a4\7f\2\2\u00a4\u00a5\7g\2\2\u00a5"+
+		"\u00a6\7t\2\2\u00a6\16\3\2\2\2\u00a7\u00a8\7d\2\2\u00a8\u00a9\7{\2\2\u00a9"+
+		"\20\3\2\2\2\u00aa\u00ab\7.\2\2\u00ab\22\3\2\2\2\u00ac\u00ad\7p\2\2\u00ad"+
+		"\u00ae\7w\2\2\u00ae\u00af\7n\2\2\u00af\u00b0\7n\2\2\u00b0\u00b1\7u\2\2"+
+		"\u00b1\24\3\2\2\2\u00b2\u00b3\7h\2\2\u00b3\u00b4\7k\2\2\u00b4\u00b5\7"+
+		"t\2\2\u00b5\u00b6\7u\2\2\u00b6\u00b7\7v\2\2\u00b7\26\3\2\2\2\u00b8\u00b9"+
+		"\7n\2\2\u00b9\u00ba\7c\2\2\u00ba\u00bb\7u\2\2\u00bb\u00bc\7v\2\2\u00bc"+
+		"\30\3\2\2\2\u00bd\u00be\7c\2\2\u00be\u00bf\7u\2\2\u00bf\u00c0\7e\2\2\u00c0"+
+		"\32\3\2\2\2\u00c1\u00c2\7f\2\2\u00c2\u00c3\7g\2\2\u00c3\u00c4\7u\2\2\u00c4"+
+		"\u00c5\7e\2\2\u00c5\34\3\2\2\2\u00c6\u00c7\7n\2\2\u00c7\u00c8\7k\2\2\u00c8"+
+		"\u00c9\7o\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7v\2\2\u00cb\36\3\2\2\2\u00cc"+
+		"\u00cd\7q\2\2\u00cd\u00ce\7h\2\2\u00ce\u00cf\7h\2\2\u00cf\u00d0\7u\2\2"+
+		"\u00d0\u00d1\7g\2\2\u00d1\u00d2\7v\2\2\u00d2 \3\2\2\2\u00d3\u00d4\7h\2"+
+		"\2\u00d4\u00d5\7g\2\2\u00d5\u00d6\7v\2\2\u00d6\u00d7\7e\2\2\u00d7\u00d8"+
+		"\7j\2\2\u00d8\"\3\2\2\2\u00d9\u00da\7-\2\2\u00da$\3\2\2\2\u00db\u00dc"+
+		"\7s\2\2\u00dc\u00dd\7w\2\2\u00dd\u00de\7g\2\2\u00de\u00df\7t\2\2\u00df"+
+		"\u00e0\7{\2\2\u00e0&\3\2\2\2\u00e1\u00e2\7n\2\2\u00e2\u00e3\7c\2\2\u00e3"+
+		"\u00e4\7|\2\2\u00e4\u00e5\7{\2\2\u00e5(\3\2\2\2\u00e6\u00e7\7q\2\2\u00e7"+
+		"\u00e8\7t\2\2\u00e8*\3\2\2\2\u00e9\u00ea\7c\2\2\u00ea\u00eb\7p\2\2\u00eb"+
+		"\u00ec\7f\2\2\u00ec,\3\2\2\2\u00ed\u00ee\7p\2\2\u00ee\u00ef\7q\2\2\u00ef"+
+		"\u00f0\7v\2\2\u00f0.\3\2\2\2\u00f1\u00f2\7k\2\2\u00f2\u00f3\7p\2\2\u00f3"+
+		"\60\3\2\2\2\u00f4\u00f5\7d\2\2\u00f5\u00f6\7g\2\2\u00f6\u00f7\7v\2\2\u00f7"+
+		"\u00f8\7y\2\2\u00f8\u00f9\7g\2\2\u00f9\u00fa\7g\2\2\u00fa\u00fb\7p\2\2"+
+		"\u00fb\62\3\2\2\2\u00fc\u00fd\7k\2\2\u00fd\u00fe\7u\2\2\u00fe\64\3\2\2"+
+		"\2\u00ff\u0100\7p\2\2\u0100\u0101\7w\2\2\u0101\u0102\7n\2\2\u0102\u0103"+
+		"\7n\2\2\u0103\66\3\2\2\2\u0104\u0105\7k\2\2\u0105\u0106\7u\2\2\u0106\u0107"+
+		"\7P\2\2\u0107\u0108\7w\2\2\u0108\u0109\7n\2\2\u0109\u010a\7n\2\2\u010a"+
+		"8\3\2\2\2\u010b\u010c\7k\2\2\u010c\u010d\7u\2\2\u010d\u010e\7P\2\2\u010e"+
+		"\u010f\7q\2\2\u010f\u0110\7v\2\2\u0110\u0111\7P\2\2\u0111\u0112\7w\2\2"+
+		"\u0112\u0113\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7p\2"+
+		"\2\u0116\u0117\7q\2\2\u0117\u0118\7v\2\2\u0118\u0119\7P\2\2\u0119\u011a"+
+		"\7w\2\2\u011a\u011b\7n\2\2\u011b\u011c\7n\2\2\u011c<\3\2\2\2\u011d\u011e"+
+		"\7g\2\2\u011e\u011f\7o\2\2\u011f\u0120\7r\2\2\u0120\u0121\7v\2\2\u0121"+
+		"\u0122\7{\2\2\u0122>\3\2\2\2\u0123\u0124\7k\2\2\u0124\u0125\7u\2\2\u0125"+
+		"\u0126\7G\2\2\u0126\u0127\7o\2\2\u0127\u0128\7r\2\2\u0128\u0129\7v\2\2"+
+		"\u0129\u012a\7{\2\2\u012a@\3\2\2\2\u012b\u012c\7k\2\2\u012c\u012d\7u\2"+
+		"\2\u012d\u012e\7P\2\2\u012e\u012f\7q\2\2\u012f\u0130\7v\2\2\u0130\u0131"+
+		"\7G\2\2\u0131\u0132\7o\2\2\u0132\u0133\7r\2\2\u0133\u0134\7v\2\2\u0134"+
+		"\u0135\7{\2\2\u0135B\3\2\2\2\u0136\u0137\7p\2\2\u0137\u0138\7q\2\2\u0138"+
+		"\u0139\7v\2\2\u0139\u013a\7G\2\2\u013a\u013b\7o\2\2\u013b\u013c\7r\2\2"+
+		"\u013c\u013d\7v\2\2\u013d\u013e\7{\2\2\u013eD\3\2\2\2\u013f\u0140\7n\2"+
+		"\2\u0140\u0141\7k\2\2\u0141\u0142\7m\2\2\u0142\u0143\7g\2\2\u0143F\3\2"+
+		"\2\2\u0144\u0145\7k\2\2\u0145\u0146\7n\2\2\u0146\u0147\7k\2\2\u0147\u0148"+
+		"\7m\2\2\u0148\u0149\7g\2\2\u0149H\3\2\2\2\u014a\u014b\7e\2\2\u014b\u014c"+
+		"\7q\2\2\u014c\u014d\7p\2\2\u014d\u014e\7v\2\2\u014e\u014f\7c\2\2\u014f"+
+		"\u0150\7k\2\2\u0150\u0151\7p\2\2\u0151\u0152\7u\2\2\u0152J\3\2\2\2\u0153"+
+		"\u0154\7k\2\2\u0154\u0155\7e\2\2\u0155\u0156\7q\2\2\u0156\u0157\7p\2\2"+
+		"\u0157\u0158\7v\2\2\u0158\u0159\7c\2\2\u0159\u015a\7k\2\2\u015a\u015b"+
+		"\7p\2\2\u015b\u015c\7u\2\2\u015cL\3\2\2\2\u015d\u015e\7u\2\2\u015e\u015f"+
+		"\7v\2\2\u015f\u0160\7c\2\2\u0160\u0161\7t\2\2\u0161\u0162\7v\2\2\u0162"+
+		"\u0163\7u\2\2\u0163\u0164\7Y\2\2\u0164\u0165\7k\2\2\u0165\u0166\7v\2\2"+
+		"\u0166\u0167\7j\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2\2\u0169\u016a\7u\2"+
+		"\2\u016a\u016b\7v\2\2\u016b\u016c\7c\2\2\u016c\u016d\7t\2\2\u016d\u016e"+
+		"\7v\2\2\u016e\u016f\7u\2\2\u016f\u0170\7Y\2\2\u0170\u0171\7k\2\2\u0171"+
+		"\u0172\7v\2\2\u0172\u0173\7j\2\2\u0173P\3\2\2\2\u0174\u0175\7g\2\2\u0175"+
+		"\u0176\7p\2\2\u0176\u0177\7f\2\2\u0177\u0178\7u\2\2\u0178\u0179\7Y\2\2"+
+		"\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c\7j\2\2\u017cR\3\2\2"+
+		"\2\u017d\u017e\7k\2\2\u017e\u017f\7g\2\2\u017f\u0180\7p\2\2\u0180\u0181"+
+		"\7f\2\2\u0181\u0182\7u\2\2\u0182\u0183\7Y\2\2\u0183\u0184\7k\2\2\u0184"+
+		"\u0185\7v\2\2\u0185\u0186\7j\2\2\u0186T\3\2\2\2\u0187\u0188\7?\2\2\u0188"+
+		"V\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7s\2\2\u018bX\3\2\2\2\u018c\u018d"+
+		"\7@\2\2\u018dZ\3\2\2\2\u018e\u018f\7i\2\2\u018f\u0190\7v\2\2\u0190\\\3"+
+		"\2\2\2\u0191\u0192\7@\2\2\u0192\u0193\7?\2\2\u0193^\3\2\2\2\u0194\u0195"+
+		"\7i\2\2\u0195\u0196\7g\2\2\u0196`\3\2\2\2\u0197\u0198\7i\2\2\u0198\u0199"+
+		"\7v\2\2\u0199\u019a\7g\2\2\u019ab\3\2\2\2\u019b\u019c\7>\2\2\u019cd\3"+
+		"\2\2\2\u019d\u019e\7n\2\2\u019e\u019f\7v\2\2\u019ff\3\2\2\2\u01a0\u01a1"+
+		"\7>\2\2\u01a1\u01a2\7?\2\2\u01a2h\3\2\2\2\u01a3\u01a4\7n\2\2\u01a4\u01a5"+
+		"\7g\2\2\u01a5j\3\2\2\2\u01a6\u01a7\7n\2\2\u01a7\u01a8\7v\2\2\u01a8\u01a9"+
+		"\7g\2\2\u01a9l\3\2\2\2\u01aa\u01ab\7>\2\2\u01ab\u01ac\7@\2\2\u01acn\3"+
+		"\2\2\2\u01ad\u01ae\7#\2\2\u01ae\u01af\7?\2\2\u01afp\3\2\2\2\u01b0\u01b1"+
+		"\7p\2\2\u01b1\u01b2\7g\2\2\u01b2r\3\2\2\2\u01b3\u01b4\7k\2\2\u01b4\u01b5"+
+		"\7g\2\2\u01b5\u01b6\7s\2\2\u01b6t\3\2\2\2\u01b7\u01b8\7<\2\2\u01b8\u01bc"+
+		"\t\2\2\2\u01b9\u01bb\t\3\2\2\u01ba\u01b9\3\2\2\2\u01bb\u01be\3\2\2\2\u01bc"+
+		"\u01ba\3\2\2\2\u01bc\u01bd\3\2\2\2\u01bdv\3\2\2\2\u01be\u01bc\3\2\2\2"+
+		"\u01bf\u01c3\t\2\2\2\u01c0\u01c2\t\4\2\2\u01c1\u01c0\3\2\2\2\u01c2\u01c5"+
+		"\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c3\u01c4\3\2\2\2\u01c4x\3\2\2\2\u01c5"+
+		"\u01c3\3\2\2\2\u01c6\u01c7\7v\2\2\u01c7\u01c8\7t\2\2\u01c8\u01c9\7w\2"+
+		"\2\u01c9\u01d0\7g\2\2\u01ca\u01cb\7h\2\2\u01cb\u01cc\7c\2\2\u01cc\u01cd"+
+		"\7n\2\2\u01cd\u01ce\7u\2\2\u01ce\u01d0\7g\2\2\u01cf\u01c6\3\2\2\2\u01cf"+
+		"\u01ca\3\2\2\2\u01d0z\3\2\2\2\u01d1\u01d3\7/\2\2\u01d2\u01d1\3\2\2\2\u01d2"+
+		"\u01d3\3\2\2\2\u01d3\u01d4\3\2\2\2\u01d4\u01db\5}?\2\u01d5\u01d7\7/\2"+
+		"\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7\u01d8\3\2\2\2\u01d8\u01db"+
+		"\5\177@\2\u01d9\u01db\5\u0081A\2\u01da\u01d2\3\2\2\2\u01da\u01d6\3\2\2"+
+		"\2\u01da\u01d9\3\2\2\2\u01db|\3\2\2\2\u01dc\u01de\t\5\2\2\u01dd\u01dc"+
+		"\3\2\2\2\u01de\u01df\3\2\2\2\u01df\u01dd\3\2\2\2\u01df\u01e0\3\2\2\2\u01e0"+
+		"\u01e1\3\2\2\2\u01e1\u01e5\7\60\2\2\u01e2\u01e4\t\5\2\2\u01e3\u01e2\3"+
+		"\2\2\2\u01e4\u01e7\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6"+
+		"~\3\2\2\2\u01e7\u01e5\3\2\2\2\u01e8\u01ec\t\6\2\2\u01e9\u01eb\t\5\2\2"+
+		"\u01ea\u01e9\3\2\2\2\u01eb\u01ee\3\2\2\2\u01ec\u01ea\3\2\2\2\u01ec\u01ed"+
+		"\3\2\2\2\u01ed\u0080\3\2\2\2\u01ee\u01ec\3\2\2\2\u01ef\u01f0\7\62\2\2"+
+		"\u01f0\u0082\3\2\2\2\u01f1\u01f7\7)\2\2\u01f2\u01f6\n\7\2\2\u01f3\u01f4"+
+		"\7)\2\2\u01f4\u01f6\7)\2\2\u01f5\u01f2\3\2\2\2\u01f5\u01f3\3\2\2\2\u01f6"+
+		"\u01f9\3\2\2\2\u01f7\u01f5\3\2\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01fa\3\2"+
+		"\2\2\u01f9\u01f7\3\2\2\2\u01fa\u01fb\7)\2\2\u01fb\u0084\3\2\2\2\u01fc"+
+		"\u01fd\t\b\2\2\u01fd\u01fe\3\2\2\2\u01fe\u01ff\bC\2\2\u01ff\u0086\3\2"+
+		"\2\2\16\2\u01bc\u01c3\u01cf\u01d2\u01d6\u01da\u01df\u01e5\u01ec\u01f5"+
+		"\u01f7\3\b\2\2";
+	public static final ATN _ATN =
+		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+	static {
+		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+		}
+	}
+}

src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens

@@ -0,0 +1,124 @@
+T__0=1
+T__1=2
+T__2=3
+T__3=4
+T__4=5
+T__5=6
+T__6=7
+T__7=8
+T__8=9
+T__9=10
+T__10=11
+T__11=12
+T__12=13
+T__13=14
+T__14=15
+T__15=16
+T__16=17
+T__17=18
+T__18=19
+T__19=20
+T__20=21
+T__21=22
+T__22=23
+T__23=24
+T__24=25
+T__25=26
+T__26=27
+T__27=28
+T__28=29
+T__29=30
+T__30=31
+T__31=32
+T__32=33
+T__33=34
+T__34=35
+T__35=36
+T__36=37
+T__37=38
+T__38=39
+T__39=40
+T__40=41
+T__41=42
+T__42=43
+T__43=44
+T__44=45
+T__45=46
+T__46=47
+T__47=48
+T__48=49
+T__49=50
+T__50=51
+T__51=52
+T__52=53
+T__53=54
+T__54=55
+T__55=56
+T__56=57
+INPUT_VARIABLE=58
+PATH_VARIABLE=59
+BOOLEAN_LITERAL=60
+NUMBER_LITERAL=61
+DOUBLE=62
+INT=63
+ZERO=64
+STRING_LITERAL=65
+WS=66
+'select'=1
+'('=2
+')'=3
+'distinct'=4
+'where'=5
+'order'=6
+'by'=7
+','=8
+'nulls'=9
+'first'=10
+'last'=11
+'asc'=12
+'desc'=13
+'limit'=14
+'offset'=15
+'fetch'=16
+'+'=17
+'query'=18
+'lazy'=19
+'or'=20
+'and'=21
+'not'=22
+'in'=23
+'between'=24
+'is'=25
+'null'=26
+'isNull'=27
+'isNotNull'=28
+'notNull'=29
+'empty'=30
+'isEmpty'=31
+'isNotEmpty'=32
+'notEmpty'=33
+'like'=34
+'ilike'=35
+'contains'=36
+'icontains'=37
+'startsWith'=38
+'istartsWith'=39
+'endsWith'=40
+'iendsWith'=41
+'='=42
+'eq'=43
+'>'=44
+'gt'=45
+'>='=46
+'ge'=47
+'gte'=48
+'<'=49
+'lt'=50
+'<='=51
+'le'=52
+'lte'=53
+'<>'=54
+'!='=55
+'ne'=56
+'ieq'=57
+'0'=64

src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java

@@ -0,0 +1,410 @@
+// Generated from /home/rob/github/avaje-ebeanorm/src/test/resources/EQL.g4 by ANTLR 4.5.3
+package com.avaje.ebeaninternal.server.grammer.antlr;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+
+/**
+ * This interface defines a complete listener for a parse tree produced by
+ * {@link EQLParser}.
+ */
+public interface EQLListener extends ParseTreeListener {
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_statement}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_statement}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_statement(EQLParser.Select_statementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#select_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterSelect_clause(EQLParser.Select_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#select_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitSelect_clause(EQLParser.Select_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#distinct}.
+	 * @param ctx the parse tree
+	 */
+	void enterDistinct(EQLParser.DistinctContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#distinct}.
+	 * @param ctx the parse tree
+	 */
+	void exitDistinct(EQLParser.DistinctContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_clause(EQLParser.Fetch_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_clause(EQLParser.Fetch_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#where_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterWhere_clause(EQLParser.Where_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#where_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitWhere_clause(EQLParser.Where_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#orderby_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#orderby_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#orderby_property}.
+	 * @param ctx the parse tree
+	 */
+	void enterOrderby_property(EQLParser.Orderby_propertyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#orderby_property}.
+	 * @param ctx the parse tree
+	 */
+	void exitOrderby_property(EQLParser.Orderby_propertyContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#nulls_firstlast}.
+	 * @param ctx the parse tree
+	 */
+	void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#nulls_firstlast}.
+	 * @param ctx the parse tree
+	 */
+	void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#asc_desc}.
+	 * @param ctx the parse tree
+	 */
+	void enterAsc_desc(EQLParser.Asc_descContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#asc_desc}.
+	 * @param ctx the parse tree
+	 */
+	void exitAsc_desc(EQLParser.Asc_descContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#limit_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterLimit_clause(EQLParser.Limit_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#limit_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitLimit_clause(EQLParser.Limit_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#offset_clause}.
+	 * @param ctx the parse tree
+	 */
+	void enterOffset_clause(EQLParser.Offset_clauseContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#offset_clause}.
+	 * @param ctx the parse tree
+	 */
+	void exitOffset_clause(EQLParser.Offset_clauseContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_path}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_path(EQLParser.Fetch_pathContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_path}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_path(EQLParser.Fetch_pathContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property_set}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property_set}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property_group}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property_group}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_property}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_property(EQLParser.Fetch_propertyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_property}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_property(EQLParser.Fetch_propertyContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_query_hint}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_query_hint}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_option(EQLParser.Fetch_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_option(EQLParser.Fetch_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_query_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_query_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_lazy_option}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_lazy_option}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#fetch_batch_size}.
+	 * @param ctx the parse tree
+	 */
+	void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#fetch_batch_size}.
+	 * @param ctx the parse tree
+	 */
+	void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_expression(EQLParser.Conditional_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_expression(EQLParser.Conditional_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_term}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_term(EQLParser.Conditional_termContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_term}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_term(EQLParser.Conditional_termContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_factor}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_factor(EQLParser.Conditional_factorContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_factor}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_factor(EQLParser.Conditional_factorContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#conditional_primary}.
+	 * @param ctx the parse tree
+	 */
+	void enterConditional_primary(EQLParser.Conditional_primaryContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#conditional_primary}.
+	 * @param ctx the parse tree
+	 */
+	void exitConditional_primary(EQLParser.Conditional_primaryContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#any_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterAny_expression(EQLParser.Any_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#any_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitAny_expression(EQLParser.Any_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#in_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIn_expression(EQLParser.In_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#in_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIn_expression(EQLParser.In_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#in_value}.
+	 * @param ctx the parse tree
+	 */
+	void enterIn_value(EQLParser.In_valueContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#in_value}.
+	 * @param ctx the parse tree
+	 */
+	void exitIn_value(EQLParser.In_valueContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#between_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterBetween_expression(EQLParser.Between_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#between_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitBetween_expression(EQLParser.Between_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#propertyBetween_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNotNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNotNull_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#like_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterLike_expression(EQLParser.Like_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#like_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitLike_expression(EQLParser.Like_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#like_op}.
+	 * @param ctx the parse tree
+	 */
+	void enterLike_op(EQLParser.Like_opContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#like_op}.
+	 * @param ctx the parse tree
+	 */
+	void exitLike_op(EQLParser.Like_opContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#comparison_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterComparison_expression(EQLParser.Comparison_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#comparison_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitComparison_expression(EQLParser.Comparison_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#comparison_operator}.
+	 * @param ctx the parse tree
+	 */
+	void enterComparison_operator(EQLParser.Comparison_operatorContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#comparison_operator}.
+	 * @param ctx the parse tree
+	 */
+	void exitComparison_operator(EQLParser.Comparison_operatorContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#value_expression}.
+	 * @param ctx the parse tree
+	 */
+	void enterValue_expression(EQLParser.Value_expressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#value_expression}.
+	 * @param ctx the parse tree
+	 */
+	void exitValue_expression(EQLParser.Value_expressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link EQLParser#literal}.
+	 * @param ctx the parse tree
+	 */
+	void enterLiteral(EQLParser.LiteralContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link EQLParser#literal}.
+	 * @param ctx the parse tree
+	 */
+	void exitLiteral(EQLParser.LiteralContext ctx);
+}

src/main/java/com/avaje/ebeaninternal/server/lib/DaemonExecutorService.java

@@ -0,0 +1,72 @@
+package com.avaje.ebeaninternal.server.lib;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A "CachedThreadPool" based on Daemon threads.
+ * <p>
+ * The Threads are created as needed and once idle live for 60 seconds.
+ */
+public final class DaemonExecutorService {
+
+  private static final Logger logger = LoggerFactory.getLogger(DaemonExecutorService.class);
+
+  private final String namePrefix;
+
+  private final int shutdownWaitSeconds;
+
+  private final ExecutorService service;
+
+  /**
+   * Construct the DaemonThreadPool.
+   *
+   * @param shutdownWaitSeconds the time in seconds allowed for the pool to shutdown nicely. After
+   *                            this the pool is forced to shutdown.
+   */
+  public DaemonExecutorService(int shutdownWaitSeconds, String namePrefix) {
+    this.service = Executors.newCachedThreadPool(new DaemonThreadFactory(namePrefix));
+    this.shutdownWaitSeconds = shutdownWaitSeconds;
+    this.namePrefix = namePrefix;
+  }
+
+  /**
+   * Execute the Runnable.
+   */
+  public void execute(Runnable runnable) {
+    service.execute(runnable);
+  }
+
+  /**
+   * Shutdown this thread pool nicely if possible.
+   * <p>
+   * This will wait a maximum of 20 seconds before terminating any threads still
+   * working.
+   * </p>
+   */
+  public void shutdown() {
+    synchronized (this) {
+      if (service.isShutdown()) {
+        logger.debug("DaemonExecutorService[{}] already shut down", namePrefix);
+        return;
+      }
+      try {
+        logger.debug("DaemonExecutorService[{}] shutting down...", namePrefix);
+        service.shutdown();
+        if (!service.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
+          logger.info("DaemonExecutorService[{}] shut down timeout exceeded. Terminating running threads.", namePrefix);
+          service.shutdownNow();
+        }
+
+      } catch (Exception e) {
+        logger.error("Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
+        e.printStackTrace();
+      }
+    }
+  }
+
+}

src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java

@@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Uses Daemon threads and hooks into shutdown event.
  * </p>
- * 
- * @author rbygrave
  */
 public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor {
 
@@ -26,19 +24,11 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
    * Construct the DaemonScheduleThreadPool.
    */
   public DaemonScheduleThreadPool(int coreSize, int shutdownWaitSeconds, String namePrefix) {
-    
     super(coreSize, new DaemonThreadFactory(namePrefix));
     this.namePrefix = namePrefix;
     this.shutdownWaitSeconds = shutdownWaitSeconds;
   }
 
-  /**
-   * Register a shutdown hook with the JVM Runtime.
-   */
-  public void registerShutdownHook() {
-    Runtime.getRuntime().addShutdownHook(new ShutdownHook());    
-  }
-  
   /**
    * Shutdown this thread pool nicely if possible.
    * <p>
@@ -66,14 +56,4 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
       }
     }
   }
-
-  /**
-   * Fired by the JVM Runtime shutdown.
-   */
-  private class ShutdownHook extends Thread {
-    @Override
-    public void run() {
-      shutdown();
-    }
-  }
 }

src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadPool.java

@@ -1,86 +0,0 @@
-package com.avaje.ebeaninternal.server.lib;
-
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The Thread Pool based on Daemon threads.
- * 
- * @author rbygrave
- */
-public final class DaemonThreadPool extends ThreadPoolExecutor {
-
-  private static final Logger logger = LoggerFactory.getLogger(DaemonThreadPool.class);
-
-  private final String namePrefix;
-
-  private final int shutdownWaitSeconds;
-
-  /**
-   * Construct the DaemonThreadPool.
-   * 
-   * @param coreSize
-   *          the core size of the thread pool.
-   * @param keepAliveSecs
-   *          the time in seconds idle threads are keep alive
-   * @param shutdownWaitSeconds
-   *          the time in seconds allowed for the pool to shutdown nicely. After
-   *          this the pool is forced to shutdown.
-   */
-  public DaemonThreadPool(int coreSize, int maximumPoolSize, long keepAliveSecs, int shutdownWaitSeconds, String namePrefix) {
-    
-    super(coreSize, maximumPoolSize, keepAliveSecs, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new DaemonThreadFactory(namePrefix));
-    allowCoreThreadTimeOut(true);
-    this.shutdownWaitSeconds = shutdownWaitSeconds;
-    this.namePrefix = namePrefix;
-  }
-
-  /**
-   * Register a shutdown hook with the JVM Runtime.
-   */
-  public void registerShutdownHook() {
-    Runtime.getRuntime().addShutdownHook(new ShutdownHook());    
-  }
-  
-  /**
-   * Shutdown this thread pool nicely if possible.
-   * <p>
-   * This will wait a maximum of 20 seconds before terminating any threads still
-   * working.
-   * </p>
-   */
-  public void shutdown() {
-    synchronized (this) {
-      if (super.isShutdown()) {
-        logger.debug("DaemonThreadPool[" + namePrefix + "] already shut down");
-        return;
-      }
-      try {
-        logger.debug("DaemonThreadPool[" + namePrefix + "] shutting down...");
-        super.shutdown();
-        if (!super.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          logger.info("DaemonThreadPool[" + namePrefix+ "] shut down timeout exceeded. Terminating running threads.");
-          super.shutdownNow();
-        }
-
-      } catch (Exception e) {
-        logger.error("Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
-        e.printStackTrace();
-      }
-    }
-  }
-
-  /**
-   * Fired by the JVM Runtime shutdown.
-   */
-  private class ShutdownHook extends Thread {
-    @Override
-    public void run() {
-      shutdown();
-    }
-  }
-}

src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java

@@ -105,7 +105,7 @@ public class BatchedPstmtHolder {
           firstError = ex;
           errorSql = bs.getSql();
         } else {
-          logger.error(null, ex);
+          logger.error("Error executing batched PreparedStatement", ex);
         }
         isError = true;
 
@@ -113,8 +113,7 @@ public class BatchedPstmtHolder {
         try {
           bs.close();
         } catch (SQLException ex) {
-          // error closing PreparedStatement
-          logger.error(null, ex);
+          logger.error("Error closing batched PreparedStatement", ex);
         }
       }
     }

src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java

@@ -1294,7 +1294,7 @@ public final class DefaultPersister implements Persister {
       // convert into a list of reference objects and perform delete by object
       List<Object> refList = new ArrayList<Object>(childIds.size());
       for (Object id : childIds) {
-        refList.add(targetDesc.createReference(null, id, null));
+        refList.add(targetDesc.createReference(null, false, id, null));
       }
       deleteList(refList, t, softDelete);
 

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

@@ -107,6 +107,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
 
   private final SpiQuery<T> query;
 
+  private final boolean disableLazyLoading;
+
   private Map<String, String> currentPathMap;
 
   private String currentPrefix;
@@ -197,6 +199,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
     this.lazyLoadManyProperty = query.getLazyLoadMany();
 
     this.readOnly = request.isReadOnly();
+    this.disableLazyLoading = query.isDisableLazyLoading();
 
     this.objectGraphNode = query.getParentNode();
     this.profilingListener = query.getProfilingListener();
@@ -239,6 +242,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
     return query.isAsDraft();
   }
 
+  @Override
+  public boolean isDisableLazyLoading() {
+    return disableLazyLoading;
+  }
+
   public Boolean isReadOnly() {
     return readOnly;
   }

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

@@ -472,8 +472,7 @@ public class CQueryBuilder {
       hasWhere = true;
     }
 
-    int asOfCount = query.getAsOfTableCount();
-    if (asOfCount > 0 && !historySupport.isStandardsBased()) {
+    if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) {
       hasWhere = appendWhere(hasWhere, sb);
       sb.append(historySupport.getAsOfPredicate(request.getBaseTableAlias()));
     }

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

@@ -197,7 +197,7 @@ public class CQueryFetchIds {
         dataReader = null;
       }
     } catch (SQLException e) {
-      logger.error(null, e);
+      logger.error("Error closing DataReader", e);
     }
     try {
       if (pstmt != null) {
@@ -205,7 +205,7 @@ public class CQueryFetchIds {
         pstmt = null;
       }
     } catch (SQLException e) {
-      logger.error(null, e);
+      logger.error("Error closing PreparedStatement", e);
     }
   }
 
@@ -228,6 +228,11 @@ public class CQueryFetchIds {
       return Boolean.FALSE;
     }
 
+    @Override
+    public boolean isDisableLazyLoading() {
+      return false;
+    }
+
     public boolean isRawSql() {
       return false;
     }

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

@@ -128,7 +128,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
 
     // the bean has an Id property and we want to use it
     this.readId = withId && (desc.getIdProperty() != null);
-    this.disableLazyLoad = disableLazyLoad || !readId || desc.isSqlSelectBased() || temporalVersions;
+    this.disableLazyLoad = disableLazyLoad || !readId || desc.isRawSqlBased() || temporalVersions;
 
     this.partialObject = props.isPartialObject();
     this.properties = props.getProps();
@@ -303,7 +303,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
     if (!lazyLoadMany && localBean != null) {
       ctx.setCurrentPrefix(prefix, pathMap);
       if (readId && !temporalVersions) {
-        createListProxies(localDesc, ctx, localBean);
+        createListProxies(localDesc, ctx, localBean, disableLazyLoad);
       }
       if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
         localDesc.setDraft(localBean);
@@ -360,7 +360,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
    * Create lazy loading proxies for the Many's except for the one that is
    * included in the actual query.
    */
-  private void createListProxies(BeanDescriptor<?> localDesc, DbReadContext ctx, EntityBean localBean) {
+  private void createListProxies(BeanDescriptor<?> localDesc, DbReadContext ctx, EntityBean localBean, boolean disableLazyLoad) {
 
     BeanPropertyAssocMany<?> fetchedMany = ctx.getManyProperty();
 
@@ -371,8 +371,13 @@ public class SqlTreeNodeBean implements SqlTreeNode {
       if (fetchedMany == null || !fetchedMany.equals(manys[i])) {
         // create a proxy for the many (deferred fetching)
         BeanCollection<?> ref = manys[i].createReferenceIfNull(localBean);
-        if (ref != null && !ref.isRegisteredWithLoadContext()) {
-          ctx.register(manys[i].getName(), ref);
+        if (ref != null) {
+          if (disableLazyLoad) {
+            ref.setDisableLazyLoad(true);
+          }
+          if (!ref.isRegisteredWithLoadContext()) {
+            ctx.register(manys[i].getName(), ref);
+          }
         }
       }
     }
@@ -433,15 +438,14 @@ public class SqlTreeNodeBean implements SqlTreeNode {
 
   public void appendWhere(DbSqlContext ctx) {
 
-    // Only apply inheritance to root node as any join will alreay have the inheritance join include - see TableJoin
+    // Only apply inheritance to root node as any join will already have the inheritance join include - see TableJoin
     if (inheritInfo != null && nodeBeanProp == null) {
       if (!inheritInfo.isRoot()) {
-        // restrict to this type and
-        // sub types of this type.
+        // restrict to this type and sub types of this type.
         if (ctx.length() > 0) {
           ctx.append(" and");
         }
-        ctx.append(" ").append(ctx.getTableAlias(prefix)).append(".");// tableAlias
+        ctx.append(" ").append(ctx.getTableAlias(prefix)).append(".");
         ctx.append(inheritInfo.getWhere()).append(" ");
       }
     }
@@ -503,6 +507,9 @@ public class SqlTreeNodeBean implements SqlTreeNode {
     if (desc.isHistorySupport()) {
       query.incrementAsOfTableCount();
     }
+    if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) {
+      query.incrementAsOfTableCount();
+    }
     if (intersectionAsOfTableAlias) {
       query.incrementAsOfTableCount();
     }

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

@@ -33,6 +33,22 @@ public final class SqlTreeNodeRoot extends SqlTreeNodeBean {
     this.includeJoin = null;
   }
 
+  /**
+   * Set AsOf support (at root level).
+   */
+  public void addAsOfTableAlias(SpiQuery<?> query) {
+    if (desc.isHistorySupport()) {
+      query.setAsOfBaseTable();
+      query.incrementAsOfTableCount();
+    }
+    if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) {
+      query.incrementAsOfTableCount();
+    }
+    for (int i = 0; i < children.length; i++) {
+      children[i].addAsOfTableAlias(query);
+    }
+  }
+
   /**
    * For the root node there is no join type or on clause etc.
    */

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -16,6 +16,7 @@ import com.avaje.ebeaninternal.api.ManyWhereJoins;
 import com.avaje.ebeaninternal.api.SpiExpression;
 import com.avaje.ebeaninternal.api.SpiExpressionList;
 import com.avaje.ebeaninternal.api.SpiExpressionValidation;
+import com.avaje.ebeaninternal.api.SpiNamedParam;
 import com.avaje.ebeaninternal.api.SpiQuery;
 import com.avaje.ebeaninternal.api.SpiQuerySecondary;
 import com.avaje.ebeaninternal.server.autotune.ProfilingListener;
@@ -28,6 +29,8 @@ import com.avaje.ebeaninternal.server.query.CancelableQuery;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +41,8 @@ import java.util.Set;
  */
 public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
+  public static final String DEFAULT_QUERY_NAME = "default";
+
   private final Class<T> beanType;
 
   private final BeanDescriptor<T> beanDescriptor;
@@ -89,11 +94,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private String generatedSql;
 
-  /**
-   * Query language version of the query.
-   */
-  private String query;
-
   private String lazyLoadProperty;
 
   private String lazyLoadManyPath;
@@ -133,6 +133,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   private Object id;
 
+  private Map<String,ONamedParam> namedParams;
+
   /**
    * Bind parameters when using the query language.
    */
@@ -144,6 +146,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private DefaultExpressionList<T> havingExpressions;
 
+  private boolean asOfBaseTable;
+
   private int asOfTableCount;
 
   /**
@@ -278,6 +282,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return softDeletePredicates;
   }
 
+  public boolean isAsOfBaseTable() {
+    return asOfBaseTable;
+  }
+
+  public void setAsOfBaseTable() {
+    this.asOfBaseTable = true;
+  }
+
   @Override
   public void incrementAsOfTableCount() {
     asOfTableCount++;
@@ -562,7 +574,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.includeTableJoin = includeTableJoin;
     copy.profilingListener = profilingListener;
 
-    copy.query = query;
+//    copy.query = query;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
     copy.sqlDistinct = sqlDistinct;
@@ -699,6 +711,13 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return forUpdate;
   }
 
+  @Override
+  public void setDefaultRawSqlIfRequired() {
+    if (beanDescriptor.isRawSqlBased() && rawSql == null) {
+      rawSql = beanDescriptor.getNamedRawSql(DEFAULT_QUERY_NAME);
+    }
+  }
+
   @Override
   public DefaultOrmQuery<T> setAutoTune(boolean autoTune) {
     this.autoTune = autoTune;
@@ -828,7 +847,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   CQueryPlanKey createQueryPlanKey() {
 
     queryPlanKey = new OrmQueryPlanKey(includeTableJoin, type, detail, maxRows, firstRow,
-        disableLazyLoading, orderBy, query,
+        disableLazyLoading, orderBy,
         distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
         temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties);
 
@@ -1129,6 +1148,15 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
    */
   @Override
   public DefaultOrmQuery<T> setParameter(String name, Object value) {
+
+    if (namedParams != null) {
+      ONamedParam param = namedParams.get(name);
+      if (param != null) {
+        param.setValue(value);
+        return this;
+      }
+    }
+
     if (bindParams == null) {
       bindParams = new BindParams();
     }
@@ -1299,11 +1327,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return bindParams;
   }
 
-  @Override
-  public String getQuery() {
-    return query;
-  }
-
   @Override
   public DefaultOrmQuery<T> where(Expression expression) {
     where().add(expression);
@@ -1327,6 +1350,13 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return whereExpressions;
   }
 
+  @Override
+  public void simplifyExpressions() {
+    if (whereExpressions != null) {
+      whereExpressions.simplify();
+    }
+  }
+
   @Override
   public DefaultOrmQuery<T> having(Expression expression) {
     having().add(expression);
@@ -1366,6 +1396,30 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     this.generatedSql = generatedSql;
   }
 
+  @Override
+  public void checkNamedParameters() {
+    if (namedParams != null) {
+      Collection<ONamedParam> values = namedParams.values();
+      for (ONamedParam value : values) {
+        value.checkValueSet();
+      }
+    }
+  }
+
+  @Override
+  public SpiNamedParam createNamedParameter(String name) {
+    if (namedParams == null) {
+      namedParams = new HashMap<String, ONamedParam>();
+    }
+
+    ONamedParam param = namedParams.get(name);
+    if (param == null) {
+      param = new ONamedParam(name);
+      namedParams.put(name, param);
+    }
+    return param;
+  }
+
   @Override
   public void setDefaultFetchBuffer(int fetchSize) {
     if (bufferFetchSizeHint == 0) {

src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java

@@ -0,0 +1,45 @@
+package com.avaje.ebeaninternal.server.querydefn;
+
+import com.avaje.ebeaninternal.api.SpiNamedParam;
+
+import javax.persistence.PersistenceException;
+
+/**
+ * Named parameter used as placeholder in expressions created by EQL language parsing.
+ */
+public class ONamedParam implements SpiNamedParam {
+
+  private final String name;
+
+  private Object value;
+
+  /**
+   * Create with the given name.
+   */
+  public ONamedParam(String name) {
+    this.name = name;
+  }
+
+  /**
+   * Set the bind value for this named parameter.
+   */
+  public void setValue(Object value) {
+    this.value = value;
+  }
+
+  /**
+   * Return the bind value for this named parameter.
+   */
+  public Object getValue() {
+    return value;
+  }
+
+  /**
+   * Check the bind value has been set (so does not support null value).
+   */
+  public void checkValueSet() {
+    if (value == null) {
+      throw new PersistenceException("Named parameter ["+name+"] has not had it's value set.");
+    }
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java

@@ -146,11 +146,10 @@ public class OrmQueryDetailParser {
   }
 
   private void readSelect() {
-    String path = null;
     String props = parser.nextWord();
     if (props.startsWith("(")) {
       props = props.substring(1, props.length() - 1);
-      OrmQueryProperties base = new OrmQueryProperties(path, props);
+      OrmQueryProperties base = new OrmQueryProperties(null, props);
       detail.setBase(base);
       parser.nextWord();
     } else {

src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java

@@ -25,7 +25,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
   private final int maxRows;
   private final int firstRow;
   private final boolean disableLazyLoading;
-  private final String query;
   private final boolean distinct;
   private final boolean sqlDistinct;
   private final String mapKey;
@@ -37,7 +36,7 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
   private final int planHash;
   private final int bindCount;
 
-  public OrmQueryPlanKey(TableJoin includeTableJoin, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading, OrderBy<?> orderBy, String query, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams, SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode, boolean forUpdate, String rootTableAlias, RawSql rawSql, OrmUpdateProperties updateProperties) {
+  public OrmQueryPlanKey(TableJoin includeTableJoin, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading, OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams, SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode, boolean forUpdate, String rootTableAlias, RawSql rawSql, OrmUpdateProperties updateProperties) {
 
     this.includeTableJoin = includeTableJoin;
     this.type = type;
@@ -46,7 +45,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
     this.firstRow = firstRow;
     this.disableLazyLoading = disableLazyLoading;
     this.orderByAsSting = (orderBy == null) ? null : orderBy.toStringFormat();
-    this.query = query;
     this.distinct = distinct;
     this.sqlDistinct = sqlDistinct;
     this.mapKey = mapKey;
@@ -63,7 +61,7 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
     HashQueryPlanBuilder builder = new HashQueryPlanBuilder();
 
     builder.add((type == null ? 0 : type.ordinal() + 1));
-    builder.add(distinct).add(sqlDistinct).add(query);
+    builder.add(distinct).add(sqlDistinct);
     builder.add(firstRow).add(maxRows);
     builder.add(orderBy).add(forUpdate);
     builder.add(mapKey);
@@ -131,7 +129,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
 
 //    if (detail != null ? !detail.equals(that.detail) : that.detail != null) return false;
 
-    if (query != null ? !query.equals(that.query) : that.query != null) return false;
     if (mapKey != null ? !mapKey.equals(that.mapKey) : that.mapKey != null) return false;
     return rootTableAlias != null ? rootTableAlias.equals(that.rootTableAlias) : that.rootTableAlias == null;
   }

src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java

@@ -11,6 +11,7 @@ import com.avaje.ebean.config.ScalarTypeConverter;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.config.dbplatform.DbType;
+import com.avaje.ebean.dbmigration.DbOffline;
 import com.avaje.ebeaninternal.server.core.bootup.BootupClasses;
 import com.avaje.ebeaninternal.server.type.reflect.CheckImmutable;
 import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
@@ -156,6 +157,8 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
 
   private final boolean postgres;
 
+  private final boolean offlineMigrationGeneration;
+
   // OPTIONAL ScalarTypes registered if Jackson/JsonNode is in the classpath
 
   /**
@@ -198,6 +201,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
 
     this.extraTypeFactory = new DefaultTypeFactory(config);
     this.postgres = isPostgres(config.getDatabasePlatform());
+    this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
 
     initialiseStandard(jsonDateTime, config);
     initialiseJavaTimeTypes(jsonDateTime, config);
@@ -961,15 +965,13 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
       nativeMap.put(Types.BIT, booleanType);
     }
 
-    boolean nativeUuidType = databasePlatform.isNativeUuidType();
     ServerConfig.DbUuid dbUuid = config.getDbUuid();
 
-    if (nativeUuidType && dbUuid == ServerConfig.DbUuid.AUTO) {
-      // DB has native support for UUID
+    if (offlineMigrationGeneration || (databasePlatform.isNativeUuidType() && dbUuid.useNativeType())) {
       typeMap.put(UUID.class, new ScalarTypeUUIDNative());
     } else {
       // Store UUID as binary(16) or varchar(40)
-      ScalarType<?> uuidType = (ServerConfig.DbUuid.BINARY == dbUuid) ? new ScalarTypeUUIDBinary() : new ScalarTypeUUIDVarchar();
+      ScalarType<?> uuidType = dbUuid.useBinary() ? new ScalarTypeUUIDBinary() : new ScalarTypeUUIDVarchar();
       typeMap.put(UUID.class, uuidType);
     }