mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Merge branch 'master' of github.com:ebean-orm/ebean
This commit is contained in:
commit
978b1dbe02
5 files changed
+23
-18
No files matched your search
@@ -1730,4 +1730,8 @@ public interface ExpressionList<T> {
|
|||||||
*/
|
*/
|
||||||
ExpressionList<T> endNot();
|
ExpressionList<T> endNot();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the current expression list.
|
||||||
|
*/
|
||||||
|
ExpressionList<T> clear();
|
||||||
}
|
}
|
||||||
@@ -193,12 +193,6 @@
|
|||||||
|
|
||||||
<!-- platforms -->
|
<!-- platforms -->
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.ebean</groupId>
|
|
||||||
<artifactId>ebean-all</artifactId>
|
|
||||||
<version>13.11.3-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.ebean</groupId>
|
<groupId>io.ebean</groupId>
|
||||||
<artifactId>ebean-clickhouse</artifactId>
|
<artifactId>ebean-clickhouse</artifactId>
|
||||||
@@ -223,12 +217,6 @@
|
|||||||
<version>13.11.3-SNAPSHOT</version>
|
<version>13.11.3-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.ebean</groupId>
|
|
||||||
<artifactId>ebean-hsqldb</artifactId>
|
|
||||||
<version>13.11.3-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.ebean</groupId>
|
<groupId>io.ebean</groupId>
|
||||||
<artifactId>ebean-mariadb</artifactId>
|
<artifactId>ebean-mariadb</artifactId>
|
||||||
@@ -259,12 +247,6 @@
|
|||||||
<version>13.11.3-SNAPSHOT</version>
|
<version>13.11.3-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.ebean</groupId>
|
|
||||||
<artifactId>ebean-sqlanywhere</artifactId>
|
|
||||||
<version>13.11.3-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.ebean</groupId>
|
<groupId>io.ebean</groupId>
|
||||||
<artifactId>ebean-sqlite</artifactId>
|
<artifactId>ebean-sqlite</artifactId>
|
||||||
|
|||||||
@@ -1268,4 +1268,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExpressionList<T> clear() {
|
||||||
|
list.clear();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1068,4 +1068,9 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExpressionList<T> clear() {
|
||||||
|
return exprList.clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+8
@@ -99,6 +99,14 @@ public class DefaultExpressionListTest extends BaseExpressionTest {
|
|||||||
.isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse();
|
.isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isSameWithClear() {
|
||||||
|
DefaultExpressionList<?> exp1 = spi(exp().eq("a", 10).eq("b", 20).clear().eq("c", 30));
|
||||||
|
DefaultExpressionList<?> exp2 = spi(exp().eq("c", 30));
|
||||||
|
same(exp1, exp2);
|
||||||
|
assertThat(exp1.isSameByBind(exp2)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Test
|
@Test
|
||||||
void copy() {
|
void copy() {
|
||||||
|
|||||||
Reference in new issue
Block a user