From 6f1472abe0517af4b407f65ea318bc8433e0beed Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 28 Apr 2020 22:13:57 +1200 Subject: [PATCH] #2000 - Tests only - bump sql server to 2019-GA-ubuntu-16.04 --- src/test/java/main/StartSqlServer.java | 2 +- .../java/org/tests/defaultvalues/TestDefaults.java | 2 ++ .../inheritance/TestInheritanceOrderColumn.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/java/main/StartSqlServer.java b/src/test/java/main/StartSqlServer.java index 7eea22376..90cf6434a 100644 --- a/src/test/java/main/StartSqlServer.java +++ b/src/test/java/main/StartSqlServer.java @@ -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"); diff --git a/src/test/java/org/tests/defaultvalues/TestDefaults.java b/src/test/java/org/tests/defaultvalues/TestDefaults.java index 4f696f8f6..b2bc6e2d1 100644 --- a/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -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;"); } diff --git a/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index e5a8f0141..dd6ef5832 100644 --- a/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -35,12 +35,10 @@ public class TestInheritanceOrderColumn extends BaseTestCase { List 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 sql, int i) { + return sql.get(i).replace("(id, ", "("); + } + }