From 970bc8e973dcd5e106c5e77a273d496a22461145 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Jul 2019 10:28:13 +1200
Subject: [PATCH] Fix tests for sql server

---
 src/test/java/org/tests/insert/TestOnlyIdEntity.java      | 3 ++-
 .../org/tests/lazyforeignkeys/TestLazyForeignKeys.java    | 8 ++++++--
 .../org/tests/query/joins/TestQueryJoinOnFormula.java     | 6 +++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
index c0dff68e9..d085891f3 100644
--- a/src/test/java/org/tests/insert/TestOnlyIdEntity.java
+++ b/src/test/java/org/tests/insert/TestOnlyIdEntity.java
@@ -1,5 +1,6 @@
 package org.tests.insert;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.ForPlatform;
@@ -11,7 +12,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestOnlyIdEntity {
+public class TestOnlyIdEntity extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
diff --git a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index d8d19dd56..76fe3374c 100644
--- a/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -60,8 +60,12 @@ public class TestLazyForeignKeys extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(3);
     assertThat(loggedSql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation");
-    assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
-    assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+    if (isSqlServer()) {
+      assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, CASE WHEN t0.id is null THEN 1 ELSE 0 END from main_entity t0");
+    } else {
+      assertThat(loggedSql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+      assertThat(loggedSql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
+    }
   }
 
   @Test
diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
index d40430874..d933f45e6 100644
--- a/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+++ b/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
@@ -122,7 +122,11 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertEquals(1, loggedSql.size());
     assertThat(loggedSql.get(0)).contains("join (select order_id, count(*) as total_items,");
-    assertThat(loggedSql.get(0)).contains("select t0.id, z_bt0.total_items from o_order t0 join (select order_id");
+    if (isSqlServer()) {
+      assertThat(loggedSql.get(0)).contains("select top 1 t0.id, z_bt0.total_items from o_order t0 join (select");
+    } else {
+      assertThat(loggedSql.get(0)).contains("select t0.id, z_bt0.total_items from o_order t0 join (select order_id");
+    }
   }
 
   @Test