From ffa68f681575969c0d036aab86c642f9bc74c64d Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 23 Mar 2016 10:41:42 +1300
Subject: [PATCH] No effective change - alter tests to run against Oracle

---
 src/test/java/com/avaje/tests/model/draftable/Link.java        | 3 ++-
 .../java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/avaje/tests/model/draftable/Link.java b/src/test/java/com/avaje/tests/model/draftable/Link.java
index c642937f1..14f57d8a2 100644
--- a/src/test/java/com/avaje/tests/model/draftable/Link.java
+++ b/src/test/java/com/avaje/tests/model/draftable/Link.java
@@ -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;
 
   /**
diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java
index 402499171..47f6603b6 100644
--- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java
@@ -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);