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

#2000 - Tests only - bump sql server to 2019-GA-ubuntu-16.04

Browse Source
This commit is contained in:
rob bygrave
2020-04-28 22:13:57 +12:00
parent 6dea4f0890
commit 6f1472abe0
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/main/StartSqlServer.java
+1 -1
View File
@@ -7,7 +7,7 @@ public class StartSqlServer {
public static void main(String[] args) {
SqlServerConfig config = new SqlServerConfig("2017-CU4");
SqlServerConfig config = new SqlServerConfig("2019-GA-ubuntu-16.04");
config.setDbName("test_ebean");
config.setUser("test_ebean");
src/test/java/org/tests/defaultvalues/TestDefaults.java
+2
View File
@@ -28,6 +28,8 @@ public class TestDefaults extends BaseTestCase {
assertThat(current).isNotEmpty();
if (isMySql()) {
assertThat(current.get(0)).contains("insert into defaults_model_draft values (default);");
} else if (isSqlServer()) {
assertThat(current.get(0)).contains("insert into defaults_model_draft (id) values (?)");
} else {
assertThat(current.get(0)).contains("insert into defaults_model_draft default values;");
}
src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java
+8 -6
View File
@@ -35,12 +35,10 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(5);
// Some platforms insert ids and others don't need to...
assertSql(sql.get(1))
.matches(
"txn\\[] insert into ordered_parent \\((id, )?order_master_inheritance_id, dtype, common_name, ordered_aname, sort_order\\).*");
assertSql(sql.get(3))
.matches(
"txn\\[] insert into ordered_parent \\((id, )?order_master_inheritance_id, dtype, common_name, ordered_bname, sort_order\\).*");
assertSql(trimId(sql, 1))
.contains("insert into ordered_parent (order_master_inheritance_id, dtype, common_name, ordered_aname, sort_order) values");
assertSql(trimId(sql, 3))
.contains("insert into ordered_parent (order_master_inheritance_id, dtype, common_name, ordered_bname, sort_order) values");
OrderMasterInheritance result = Ebean.find(OrderMasterInheritance.class).findOne();
assertThat(result.getReferenced())
@@ -65,4 +63,8 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
.containsExactly("commonOrderedB", "commonOrderedA");
}
private String trimId(List<String> sql, int i) {
return sql.get(i).replace("(id, ", "(");
}
}