CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1774 from querydsl/dml-isEmpty

Browse Source 
Fix isEmpty implementation
This commit is contained in:
Timo Westkämper 2016-01-31 13:37:29 +02:00
commit ba01c3df3a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
View File

@ -563,7 +563,7 @@ public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements
@Override
public boolean isEmpty() {
return values.isEmpty();
return values.isEmpty() && batches.isEmpty();
}
@Override

1
querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
View File

@ -156,6 +156,7 @@ public class MergeBase extends AbstractBaseTest {
.set(survey.name, "5")
.addBatch();
assertEquals(1, merge.getBatchCount());
assertFalse(merge.isEmpty());
merge
.keys(survey.id)