github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'foc-imports'

Browse Source
This commit is contained in:
rob bygrave
2020-02-01 13:18:55 +13:00
parent e3dba6bfe1 c0b6f291a1
commit cacf033647
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/api/SpiExpression.java
+3
View File
@@ -13,6 +13,9 @@ import java.io.IOException;
*/
public interface SpiExpression extends Expression {
static final String SQL_TRUE = "1=1";
static final String SQL_FALSE = "1=0";
/**
* Simplify nested expressions if possible.
*/
src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
public void addSql(SpiExpressionRequest request) {
if (list.isEmpty()) {
request.append("1=1");
request.append(SQL_TRUE);
} else {
request.append("(");
for (int i = 0; i < list.size(); i++) {
src/main/java/io/ebeaninternal/server/expression/IdInExpression.java
+5 -3
View File
@@ -74,7 +74,9 @@ public class IdInExpression extends NonPrepareExpression {
@Override
public void addBindValues(SpiExpressionRequest request) {
if (idCollection.isEmpty()) {
return;
}
// Bind the Id values including EmbeddedId and multiple Id
DefaultExpressionRequest r = (DefaultExpressionRequest) request;
@@ -92,7 +94,7 @@ public class IdInExpression extends NonPrepareExpression {
BeanDescriptor<?> descriptor = r.getBeanDescriptor();
IdBinder idBinder = descriptor.getIdBinder();
if (idCollection.isEmpty()) {
request.append("1=0"); // append false for this stage
request.append(SQL_FALSE); // append false for this stage
} else {
request.append(descriptor.getIdBinder().getBindIdInSql(null));
String inClause = idBinder.getIdInValueExpr(false, idCollection.size());
@@ -107,7 +109,7 @@ public class IdInExpression extends NonPrepareExpression {
BeanDescriptor<?> descriptor = r.getBeanDescriptor();
IdBinder idBinder = descriptor.getIdBinder();
if (idCollection.isEmpty()) {
request.append("1=0"); // append false for this stage
request.append(SQL_FALSE); // append false for this stage
} else {
request.append(descriptor.getIdBinderInLHSSql());
String inClause = idBinder.getIdInValueExpr(false, idCollection.size());
src/main/java/io/ebeaninternal/server/expression/InExpression.java
+1 -2
View File
@@ -17,8 +17,7 @@ import java.util.List;
class InExpression extends AbstractExpression {
private static final String SQL_TRUE = "1=1";
private static final String SQL_FALSE = "1=0";
private final boolean not;
src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java
+1 -1
View File
@@ -93,7 +93,7 @@ class InPairsExpression extends AbstractExpression {
public void addSql(SpiExpressionRequest request) {
if (entries.isEmpty()) {
String expr = not ? "1=1" : "1=0";
String expr = not ? SQL_TRUE : SQL_FALSE;
request.append(expr);
return;
}
src/main/java/io/ebeaninternal/server/expression/NoopExpression.java
+1 -1
View File
@@ -76,7 +76,7 @@ class NoopExpression implements SpiExpression {
@Override
public void addSql(SpiExpressionRequest request) {
request.append("1=1");
request.append(SQL_TRUE);
}
@Override