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

Fix tests for sql server

Browse Source
This commit is contained in:
rob bygrave
2019-07-19 10:28:13 +12:00
parent 4513dbf29d
commit 970bc8e973
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/insert/TestOnlyIdEntity.java
+2 -1
View File
@@ -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
src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+6 -2
View File
@@ -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
src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java
+5 -1
View File
@@ -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