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

No effective change - alter tests to run against Oracle

Browse Source
This commit is contained in:
Robin Bygrave
2016-03-23 10:41:42 +13:00
parent 2cb0794a01
commit ffa68f6815
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/model/draftable/Link.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.avaje.ebean.annotation.Draftable;
import com.avaje.ebean.annotation.History;
import com.avaje.ebean.annotation.SoftDelete;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import java.sql.Timestamp;
@@ -34,7 +35,7 @@ public class Link extends BaseDomain {
/**
* Draft reset to null on publish.
*/
@DraftReset
@DraftReset @Column(name = "link_comment")
String comment;
/**
src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java
+2 -1
View File
@@ -62,7 +62,8 @@ public class TestSoftDeleteBasic extends BaseTestCase {
List<String> loggedSql = LoggedSqlCollector.stop();
assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("where coalesce(t0.deleted,false)=false");
// usually where coalesce(t0.deleted,false)=false but false is 0 for Oracle etc
assertThat(loggedSql.get(0)).contains("where coalesce(t0.deleted,");
assertThat(rowCountAfter).isEqualTo(rowCountBefore - 1);