Merge branch 'master' of github.com:ebean-orm/ebean

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -100,6 +100,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -107,6 +108,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Describes Beans including their deployment information.
@@ -1133,6 +1136,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Return true if this object is the root level object in its entity
    * inheritance.
    */
+  @Override
   public boolean isInheritanceRoot() {
     return inheritInfo == null || inheritInfo.isRoot();
   }
@@ -3475,4 +3479,29 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public List<BeanProperty[]> getUniqueProps() {
     return propertiesUnique;
   }
+
+  @Override
+  public List<BeanType<?>> getInheritanceChildren() {
+    if (hasInheritance()) {
+      return getInheritInfo().getChildren()
+        .stream()
+        .map(InheritInfo::desc)
+        .collect(Collectors.toList());
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
+  @Override
+  public BeanType<?> getInheritanceParent() {
+    return getInheritInfo() == null ? null : getInheritInfo().getParent().desc();
+  }
+
+  @Override
+  public void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor) {
+    if (hasInheritance()) {
+      getInheritInfo().visitChildren(info -> visitor.accept(info.desc()));
+    }
+  }
+
 }

src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -979,6 +979,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the full name of this property.
    */
+  @Override
   public String getFullBeanName() {
     return descriptor.getFullName() + "." + name;
   }
@@ -994,6 +995,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the scalarType.
    */
+  @Override
   @SuppressWarnings(value = "unchecked")
   public ScalarType<Object> getScalarType() {
     return scalarType;
@@ -1369,6 +1371,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   /**
    * Return the property type.
    */
+  @Override
   public Class<?> getPropertyType() {
     return propertyType;
   }

src/main/java/io/ebeaninternal/server/deploy/DeployParser.java

@@ -25,6 +25,7 @@ public abstract class DeployParser {
   protected static final char OPEN_SQUARE_BRACKET = '[';
   protected static final char CLOSE_SQUARE_BRACKET = ']';
   protected static final char DOUBLE_QUOTE = '\"';
+  protected static final char BACK_QUOTE = '`';
 
   /**
    * Used to determine when a column name terminates.
@@ -187,10 +188,10 @@ public abstract class DeployParser {
       wordBuffer.append(ch);
       return false;
     }
-    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD || ch == DOUBLE_QUOTE || ch == CLOSE_SQUARE_BRACKET;
+    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD || ch == DOUBLE_QUOTE || ch == CLOSE_SQUARE_BRACKET || ch == BACK_QUOTE;
   }
 
   private boolean isWordStart(char ch) {
-    return Character.isLetter(ch) || ch == UNDERSCORE || ch == DOUBLE_QUOTE || ch == OPEN_SQUARE_BRACKET;
+    return Character.isLetter(ch) || ch == UNDERSCORE || ch == DOUBLE_QUOTE || ch == OPEN_SQUARE_BRACKET || ch == BACK_QUOTE;
   }
 }

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java

@@ -82,12 +82,12 @@ public abstract class AnnotationBase {
     T a = null;
     Field field = prop.getField();
     if (field != null) {
-      a = AnnotationUtil.findAnnotation(field, annClass);
+      a = AnnotationUtil.findAnnotation(field, annClass, platform);
     }
     if (a == null) {
       Method method = prop.getReadMethod();
       if (method != null) {
-        a = AnnotationUtil.findAnnotation(method, annClass);
+        a = AnnotationUtil.findAnnotation(method, annClass, platform);
       }
     }
     return a;

src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java

@@ -92,14 +92,7 @@ class InPairsExpression extends AbstractExpression {
       return;
     }
 
-    String concat = request.getDbPlatformHandler().getConcatOperator();
-
-    String concatFormula = "(" + property0 + concat + "'" + separator + "'" + concat + property1;
-    if (suffix != null && !suffix.isEmpty()) {
-      concatFormula += concat + "'" + suffix + "'";
-    }
-    concatFormula += ")";
-    request.append(concatFormula);
+    request.append(request.getDbPlatformHandler().concat(property0, separator, property1, suffix));
     request.appendInExpression(not, concatBindValues);
   }
 

src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java

@@ -8,17 +8,6 @@ import io.ebeaninternal.server.expression.BitwiseOp;
  */
 abstract class BaseDbExpression implements DbExpressionHandler {
 
-  private final String concatOperator;
-
-  BaseDbExpression(String concatOperator) {
-    this.concatOperator = concatOperator;
-  }
-
-  @Override
-  public String getConcatOperator() {
-    return concatOperator;
-  }
-
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
 
@@ -57,4 +46,14 @@ abstract class BaseDbExpression implements DbExpressionHandler {
     }
   }
 
+  @Override
+  public String concat(String property0, String separator, String property1, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("concat(").append(property0).append(",'").append(separator).append("',").append(property1);
+    if (suffix != null && !suffix.isEmpty()) {
+      sb.append(",'").append(suffix).append('\'');
+    }
+    sb.append(')');
+    return sb.toString();
+  }
 }

src/main/java/io/ebeaninternal/server/expression/platform/BasicDbExpression.java

@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class BasicDbExpression extends BaseDbExpression {
 
-  BasicDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
     throw new RuntimeException("JSON expressions only supported on Postgres and Oracle");

src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandler.java

@@ -9,11 +9,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public interface DbExpressionHandler {
 
-  /**
-   * Return the DB concat operator (Usually SQL standard "||").
-   */
-  String getConcatOperator();
-
   /**
    * Write the db platform specific json expression.
    */
@@ -33,4 +28,9 @@ public interface DbExpressionHandler {
    * Add the bitwise expression.
    */
   void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match);
+
+  /**
+   * Performs a "CONCAT" operation for that platform.
+   */
+  String concat(String property0, String separator, String property1, String suffix);
 }

src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java

@@ -12,20 +12,21 @@ public class DbExpressionHandlerFactory {
   public static DbExpressionHandler from(DatabasePlatform databasePlatform) {
 
     Platform platform = databasePlatform.getPlatform();
-    String concatOperator = databasePlatform.getConcatOperator();
     switch (platform) {
       case H2:
-        return new H2DbExpression(concatOperator);
+        return new H2DbExpression();
       case POSTGRES:
-        return new PostgresDbExpression(concatOperator);
+        return new PostgresDbExpression();
       case MYSQL:
-        return new MySqlDbExpression(concatOperator);
+        return new MySqlDbExpression();
       case ORACLE:
-        return new OracleDbExpression(concatOperator);
+        return new OracleDbExpression();
+      case SQLSERVER16:
+      case SQLSERVER17:
       case SQLSERVER:
-        return new SqlServerDbExpression(concatOperator);
+        return new SqlServerDbExpression();
       default:
-        return new BasicDbExpression(concatOperator);
+        return new BasicDbExpression();
     }
   }
 }

src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java

@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.BitwiseOp;
  */
 class H2DbExpression extends BasicDbExpression {
 
-  H2DbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) {
 

src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java

@@ -5,8 +5,4 @@ package io.ebeaninternal.server.expression.platform;
  */
 class MySqlDbExpression extends BasicDbExpression {
 
-  MySqlDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
 }

src/main/java/io/ebeaninternal/server/expression/platform/OracleDbExpression.java

@@ -9,10 +9,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class OracleDbExpression extends BaseDbExpression {
 
-  OracleDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
 

src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java

@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class PostgresDbExpression extends BaseDbExpression {
 
-  PostgresDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) {
 
@@ -65,4 +61,16 @@ public class PostgresDbExpression extends BaseDbExpression {
       request.append(" <> 0");
     }
   }
+
+  @Override
+  public String concat(String property0, String separator, String property1, String suffix) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("(").append(property0).append("||'").append(separator).append("'||").append(property1);
+
+    if (suffix != null && !suffix.isEmpty()) {
+      sb.append("||'").append(suffix).append('\'');
+    }
+    sb.append(')');
+    return sb.toString();
+  }
 }

src/main/java/io/ebeaninternal/server/expression/platform/SqlServerDbExpression.java

@@ -8,10 +8,6 @@ import io.ebeaninternal.server.expression.Op;
  */
 public class SqlServerDbExpression extends BaseDbExpression {
 
-  SqlServerDbExpression(String concatOperator) {
-    super(concatOperator);
-  }
-
   @Override
   public void json(final SpiExpressionRequest request, final String propName,
                    final String path, final Op operator, final Object value) {

src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -417,7 +417,9 @@ class CQueryBuilder {
 
     BeanDescriptor<?> desc = request.getBeanDescriptor();
     try {
-      PreparedStatement statement = connection.prepareStatement(sql);
+      // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
+      // statement here by specifying ResultSet.CONCUR_UPDATABLE
+      PreparedStatement statement = connection.prepareStatement(sql,ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
       predicates.bind(statement, connection);
 
       ResultSet resultSet = statement.executeQuery();